improves in locator and find
Merge pull request #1821 from diegosarmentero/master

improves in locator and find