H1B, H4 Visa

Hi everyone, I wanted to share my experience.. My current I 797 and H1b visa are valid from July 2019 till July 2022. I went to India in Jan 2020, got my H1b stamped and upon return used global entry kiosk at JFK airport. So I did not have interaction with CBP officer. It was my oversight that I did not check date of validity on I 94. I only checked it in April 2022 as I planning change to different visa. To my shock/Surprise the date of validity was erroneously placed as July 2020(this was not due to expiration of passport). I consulted few different attorneys and they suggested to contact CBP first. I was apprehensive/nervous and therefore took attorney's help.
I took services of an attorney and he emailed CBP on my behalf and they corrected it within 2 days. During my research I found that you can try emailing/calling CBP on your own. Sometimes if a CBP at a particular city does not correct it, you can contact CBP at a different city. You can try this at multiple cities. It might not be a bad idea to taking services of immigration attorney, as they might know local CBP officers in their city, with whom they might have previously worked with. This also helps. But depending on attorney it might cost $$.