Add type to Elastic search result

Looks like we index the metric type but we don't expose it in results. We need the type to be exposed.