Correctly filter city or area.

When separate dropdowns for city and area are shown in one form we must
ensure that the correct search criterion is applied.  Previously we
checked for an area or city ID parameter but both of those will be
present in the form submission.  Instead we check for the name of the
submit button.