Fix aggregation on all pages

Apparently for comprehensions on agents don't work like I expected them to :-1: