Aggregator app - improvements

Extended current functionality