minor markup cleanup
oops, had to put the message bar back in
handle city name only searches