diff --git a/assets/layers/dentist/dentist.json b/assets/layers/dentist/dentist.json
index a0764af7e3..33d89fdc5d 100644
--- a/assets/layers/dentist/dentist.json
+++ b/assets/layers/dentist/dentist.json
@@ -89,9 +89,8 @@
   "tagRenderings": [
     "images",
     "opening_hours",
-    "phone",
-    "email",
-    "website",
+    "contact",
+    "address.address",
     {
       "question": {
         "en": "What is the name of this dentist?",
diff --git a/assets/layers/doctors/doctors.json b/assets/layers/doctors/doctors.json
index 4deb5e7f27..be9d5997fa 100644
--- a/assets/layers/doctors/doctors.json
+++ b/assets/layers/doctors/doctors.json
@@ -102,9 +102,8 @@
       "id": "name"
     },
     "opening_hours_by_appointment",
-    "phone",
-    "email",
-    "website",
+    "contact",
+    "address.address",
     {
       "id": "specialty",
       "render": {
diff --git a/assets/layers/hospital/hospital.json b/assets/layers/hospital/hospital.json
index c806050eb9..d06f26ef73 100644
--- a/assets/layers/hospital/hospital.json
+++ b/assets/layers/hospital/hospital.json
@@ -144,6 +144,7 @@
       }
     },
     "contact",
+    "address.address",
     {
       "id": "oh-visitor",
       "question": {
diff --git a/assets/layers/pharmacy/pharmacy.json b/assets/layers/pharmacy/pharmacy.json
index 14cc6ae8f0..a36d84f732 100644
--- a/assets/layers/pharmacy/pharmacy.json
+++ b/assets/layers/pharmacy/pharmacy.json
@@ -148,6 +148,7 @@
     },
     "opening_hours",
     "contact",
+    "address.address",
     "payment-options",
     "wheelchair"
   ],
diff --git a/assets/layers/physiotherapist/physiotherapist.json b/assets/layers/physiotherapist/physiotherapist.json
index 0a0f6327a9..db3c24661b 100644
--- a/assets/layers/physiotherapist/physiotherapist.json
+++ b/assets/layers/physiotherapist/physiotherapist.json
@@ -95,9 +95,8 @@
       "id": "name"
     },
     "opening_hours_by_appointment",
-    "phone",
-    "email",
-    "website"
+    "contact",
+    "address.address"
   ],
   "filter": [
     "open_now"
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index e3ffb4d2e2..da52bbaa40 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -418,10 +418,6 @@
                     "if": "theme=mapcomplete-changes",
                     "then": "./assets/svg/logo.svg"
                   },
-                  {
-                    "if": "theme=maproulette",
-                    "then": "./assets/layers/maproulette/logomark.svg"
-                  },
                   {
                     "if": "theme=maps",
                     "then": "./assets/themes/maps/logo.svg"