Working Maps. Search needs adjusting