diff --git a/mappings/on_search.jsonata b/mappings/on_search.jsonata
index 5d802f696336576d11a237a4f4d19f86d3bdcb39..2ff750eda1bcd5b8b062341ffb470ece7230fe0a 100644
--- a/mappings/on_search.jsonata
+++ b/mappings/on_search.jsonata
@@ -56,6 +56,12 @@
                                         "state": location.state.name,
                                         "area_code": location.area_code
                                     }
+                                }[],
+                                "tags": tags.{
+                                    "code": descriptor.code,
+                                    "name": descriptor.name,
+                                    "display": display,
+                                    "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
                                 }[]
                             }
                         }