Fix funny issues with search form (what happens when country or area are
selected)