Re-added city search, still need to make both form fields optional