CDB-4232 Fix bug in query 'column reference "country" is ambiguous' [admin1, text, polygon]