improve locate service for emf models