bug fix + location search