make sure geo_field is always included even when fields are explicitly specified