tweak queries to use simplified country/province polys