EPS Contribution Correction - how to track / mitigate during job change

Have faced EPS contribution issue (2016 joinee, 15k+ salary but EPS deducted) affecting my pf transfers from old companies to current one. With efforts and applications, I got my all funds transferred to the current employer but EPS merger with EPF is still due, for which I've raised request to my current employer for correction.

a. They stopped my EPS contribution and have mentioned they'll submit correction request to EPFO with financial year closing. Though they are saying that the timelines is not clear. Any suggestions how to track and fastrack for closure of it with Delhi pf office?

b. While the correction request is in process and if I change my job during this, what precaution should I keep so as not to have eps contribution restarted by the next employer by default following past practice and to avoid the trap starting again?

Specific Inputs would be valuable.