Exporting Without edits

Hey there, since the new update I've noticed that there seems to be an issue exporting. When i edit my photos and go to export, I used to be able to select JPEG and it would export with my edits.. now clicking JPEG converts it to its original? and when I select Original+Settings It exports the edited version.. Which is both confusing and annoying as I edit in CR2 and export as JPEG .. my website doesnt recognise CR2 files..

Anyone having a similar issue or know how to fix this? 

Ive already tried playing with all the sizing and quality settings.. with no joy. This never used to be an issue.