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