improve locate service for emf models
Merge branch 'develop'