Added mapping type detection for fields before automatically converting the queries to multi_field ready