Added better indexs, and improved aggregation sped