Add city search form validations. Tidy-up the code.