Using elastic search for the map instead