Battlefield 1 Achievements Not Unlocking, Have Contacted EA Games and Xbox

I am on PC, and also having issues with achievements. Played campaign, while being online, lost my internet connection. Now I have three achievements that are locked, even if I try to replay the campaign or redo the required task (melee 3 officers) for example. Tried restarting the game, origin client - nothing seems to work. As you can see in my attached files I have completed all challenges, but still 2 achievements for codexes are greyed out.