move country to end of structured query

Fixes https://trac.openstreetmap.org/ticket/4918