Issue #2261425 by ParisLiakos, alexpott: Streamline aggregator's entities rendering with rest of core.