Fixing city/state search features