Merged map and search functionality with frontend branch.