Refactored Aggregation job, fixed rspece query