Clean-up and re-factoring for LocationSearchPanel