BUG FIXING: Aggreagtion View