Merge City Search Functionality

We need to integrate my functionality with the current code.