Make "County name" a searchable component and ensure that the county variable (which has a more confusing UI) remains overridden. This should enable #2590.