issue #20039: apply country filter to state from the outset
Merge pull request #259 from shackbarth/20039

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