Merged Steve and I's work for the night. Added 'display' for cities in search.