refactoring, bug fixes, tests, locationsearch v0.1