Fix elasticsearch datatype mapping