Aggregation fix, making criteria fix
Aggregation fix, making criteria fix