issue #20039: apply country filter to state from the outset