Fix indentation; Improve location-based search