Modified the location based search handler and fixed bugs, pep8