NEW: Changes to the ES mapping and fixing some fields