ES templating with hyphen

Hi all,

I am using ES templating in grafana. I have a Hyphen (-) in my data source. However, when I add the template, it is being split at the hyphen. Not sure what is the issue. Please help.

Grafana verison: Grafana v4.3.0-beta1 (commit: 3a89272)
ES: 2.3.1

Probably related to elasticsearch indexing, make sure the property is index as a keyword if you do not want elasticsearch to split it