Issue #2261425 by ParisLiakos, alexpott: Streamline aggregator's entities rendering with rest of core.
Issue #1342504 by jbrown, Jelle_S, Dave Reid: Support data URIs.