Backport Unicode Query fix, gis_location list_fields