issue #18864: country/state and issue #18820: search labels