Improves locate plugin