added weird terms and other aggregations