Fix #1508 #1574 #1607 #1608 Use non-analyzed field for aggregation
Merge pull request #1616 from dennishendriksen/master

Fix #1508 #1574 #1607 #1608 Use non-analyzed field for aggregation