diff --git a/src/schema/rgsummary.xsd b/src/schema/rgsummary.xsd
index d433dc358..588cafcd6 100644
--- a/src/schema/rgsummary.xsd
+++ b/src/schema/rgsummary.xsd
@@ -88,7 +88,7 @@
                           <xsd:element name="Tags">
                             <xsd:complexType>
                               <xsd:sequence>
-                                <xsd:element minOccurs="0" name="Tag" type="xsd:string" />
+                                <xsd:element minOccurs="0" maxOccurs="unbounded" name="Tag" type="xsd:string" />
                               </xsd:sequence>
                             </xsd:complexType>
                           </xsd:element>
diff --git a/src/webapp/topology.py b/src/webapp/topology.py
index f27fdb0da..4fd99b583 100644
--- a/src/webapp/topology.py
+++ b/src/webapp/topology.py
@@ -145,8 +145,8 @@ def _expand_services(self, services: Dict) -> List[OrderedDict]:
             svc.move_to_end("ID", last=False)
         return services_list
 
-    def _expand_tags(self, tags: List) -> List[Dict]:
-        return [ {"Tag": tag} for tag in tags ]
+    def _expand_tags(self, tags: List) -> Dict[str, list]:
+        return {"Tag": tags}
 
     @staticmethod
     def _expand_voownership(voownership: Dict) -> OrderedDict: