revert to previous mappings
insert underscore into indices_client
fix exception mechanism
massage datestamp so it fits with the established ES mapping
improve tests based on PR feedback