Adjustment of Status - I-485

I filed for an EB2-ROW in October 2018, and my I-140 was approved in only 1 month in Nov 2018. Then in the past month - July 2019 - I had my AoS interview which went really well as IO mentioned that I should expect GC in 2-3 weeks. However, after few days I was surprised to see my status changed to Case transferred to new office will have jurisdiction. My lawyer was able find out that USCIS realized that my I-140 form was wrongly marked (clerical mistake) as EB1 instead of EB2 in Page-1 Part-2 of the I-140 form while all supporting documents and cover letter clearly indicating EB2. And seems that NSC officer initially adjudicated and approved the I-140 as an EB1 instead of EB2 based on the form and did not check the cover letter. Because of this, the FO decided after the interview to send it back to NSC to resolve this discrepancy first. How do you think NSC will approach this issue given that they have already approved my I-140 (note I also meet EB1 criteria) ? Do we need to send USCIS a corrected I40 form to document our actual intent? and finally once the issue is resolved, will USCIS put me through another round of AoS process / interview. Really appreciate your advice.