Hi Jim,
I encountered the same issue, not sure if the approach is right, but I mapped the fields to keywords, or use the raw multifield mapping,
PUT my_index
{
  "mappings": {
    "my_type": {
      "properties": {
        "city": {
          "type": "text",
          "fields": {
            "raw_city": { 
              "type":  "keyword"
            }
          }
        }
      }
    }
  }
}
reference link:
https://www.elastic.co/guide/en/elasticsearch/reference/current/multi-fields.html
and it worked for me.
Hope this helps you too
Best,
J