diff --git a/modules/aggregator/lib/Aggregator.php b/modules/aggregator/lib/Aggregator.php
index 1f3474b58dfd959afc4556f30e30bf62f9560d7c..2b30d46cd004e94db9363edb30fb7fe73c1b0609 100644
--- a/modules/aggregator/lib/Aggregator.php
+++ b/modules/aggregator/lib/Aggregator.php
@@ -96,7 +96,10 @@ class sspmod_aggregator_Aggregator {
 			foreach ($this->sets as $set) {
 				
 				foreach ($source->getMetadataSet($set) as $entityId => $metadata) {
-					
+
+					$metadata['entityid'] = $entityId;
+					$metadata['metadata-set'] = $set;
+
 					if (isset($metadata['tags']) && 
 							count(array_intersect($this->excludeTags, $metadata['tags'])) > 0) {