diff --git a/LICENSE b/LICENSE
index 782393c26..892dfbe7d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,5 @@
+ISC License
+
 Copyright (c) 2015, iD Contributors
 
 Permission to use, copy, modify, and/or distribute this software for any
diff --git a/data/presets.yaml b/data/presets.yaml
index 45bda88bf..39d6c0f1b 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -466,6 +466,9 @@ en:
       internet_access/fee:
         # 'internet_access:fee=*'
         label: Internet Access Fee
+      kerb:
+        # kerb=*
+        label: Curb Ramp
       lamp_type:
         # lamp_type=*
         label: Type
@@ -868,9 +871,6 @@ en:
       site:
         # site=*
         label: Type
-      sloped_curb:
-        # sloped_curb=*
-        label: Sloped Curb
       smoking:
         # smoking=*
         label: Smoking
@@ -1394,7 +1394,7 @@ en:
       amenity/pharmacy:
         # amenity=pharmacy
         name: Pharmacy
-        # 'terms: drug,medicine'
+        # 'terms: drug*,med*,prescription'
         terms: '<translate with synonyms or related terms for ''Pharmacy'', separated by commas>'
       amenity/place_of_worship:
         # amenity=place_of_worship
@@ -3209,8 +3209,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Cheese Store'', separated by commas>'
       shop/chemist:
         # shop=chemist
-        name: Chemist
-        terms: '<translate with synonyms or related terms for ''Chemist'', separated by commas>'
+        name: Drugstore
+        # 'terms: med*,drug*,gift'
+        terms: '<translate with synonyms or related terms for ''Drugstore'', separated by commas>'
       shop/chocolate:
         # shop=chocolate
         name: Chocolate Store
diff --git a/data/presets/fields.json b/data/presets/fields.json
index bc25238b9..1c41e98aa 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -640,6 +640,11 @@
         "type": "check",
         "label": "Internet Access Fee"
     },
+    "kerb": {
+        "key": "kerb",
+        "type": "combo",
+        "label": "Curb Ramp"
+    },
     "lamp_type": {
         "key": "lamp_type",
         "type": "combo",
@@ -1155,11 +1160,6 @@
         "type": "combo",
         "label": "Type"
     },
-    "sloped_curb": {
-        "key": "sloped_curb",
-        "type": "combo",
-        "label": "Sloped Curb"
-    },
     "smoking": {
         "key": "smoking",
         "type": "combo",
diff --git a/data/presets/fields/kerb.json b/data/presets/fields/kerb.json
new file mode 100644
index 000000000..62ec55ee0
--- /dev/null
+++ b/data/presets/fields/kerb.json
@@ -0,0 +1,5 @@
+{
+    "key": "kerb",
+    "type": "combo",
+    "label": "Curb Ramp"
+}
diff --git a/data/presets/fields/sloped_curb.json b/data/presets/fields/sloped_curb.json
deleted file mode 100644
index a293a4751..000000000
--- a/data/presets/fields/sloped_curb.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "key": "sloped_curb",
-    "type": "combo",
-    "label": "Sloped Curb"
-}
\ No newline at end of file
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 1f59e0393..4a24d32b2 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1289,8 +1289,9 @@
             "amenity": "pharmacy"
         },
         "terms": [
-            "drug",
-            "medicine"
+            "drug*",
+            "med*",
+            "prescription"
         ],
         "name": "Pharmacy"
     },
@@ -4040,7 +4041,7 @@
             "crossing",
             "access",
             "surface",
-            "sloped_curb",
+            "kerb",
             "tactile_paving"
         ],
         "geometry": [
@@ -4059,7 +4060,7 @@
             "crossing",
             "access",
             "surface",
-            "sloped_curb",
+            "kerb",
             "tactile_paving"
         ],
         "geometry": [
@@ -4288,7 +4289,7 @@
     "highway/crossing": {
         "fields": [
             "crossing",
-            "sloped_curb",
+            "kerb",
             "tactile_paving"
         ],
         "geometry": [
@@ -4303,7 +4304,7 @@
     "highway/crosswalk": {
         "fields": [
             "crossing",
-            "sloped_curb",
+            "kerb",
             "tactile_paving"
         ],
         "geometry": [
@@ -8288,7 +8289,7 @@
         "name": "Cheese Store"
     },
     "shop/chemist": {
-        "icon": "chemist",
+        "icon": "grocery",
         "fields": [
             "operator",
             "address",
@@ -8302,7 +8303,12 @@
         "tags": {
             "shop": "chemist"
         },
-        "name": "Chemist"
+        "terms": [
+            "med*",
+            "drug*",
+            "gift"
+        ],
+        "name": "Drugstore"
     },
     "shop/chocolate": {
         "icon": "shop",
@@ -33779,7 +33785,7 @@
             "shop": "chemist"
         },
         "name": "dm",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33798,7 +33804,7 @@
             "shop": "chemist"
         },
         "name": "Müller",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33817,7 +33823,7 @@
             "shop": "chemist"
         },
         "name": "Schlecker",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33836,7 +33842,7 @@
             "shop": "chemist"
         },
         "name": "Etos",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33855,7 +33861,7 @@
             "shop": "chemist"
         },
         "name": "Bipa",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33874,7 +33880,7 @@
             "shop": "chemist"
         },
         "name": "Rossmann",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33893,7 +33899,7 @@
             "shop": "chemist"
         },
         "name": "DM Drogeriemarkt",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33912,7 +33918,7 @@
             "shop": "chemist"
         },
         "name": "Ihr Platz",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33931,7 +33937,7 @@
             "shop": "chemist"
         },
         "name": "Douglas",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33950,7 +33956,7 @@
             "shop": "chemist"
         },
         "name": "Kruidvat",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
diff --git a/data/presets/presets/amenity/pharmacy.json b/data/presets/presets/amenity/pharmacy.json
index f4a1b5597..6c7a0a046 100644
--- a/data/presets/presets/amenity/pharmacy.json
+++ b/data/presets/presets/amenity/pharmacy.json
@@ -15,8 +15,9 @@
         "amenity": "pharmacy"
     },
     "terms": [
-        "drug",
-        "medicine"
+        "drug*",
+        "med*",
+        "prescription"
     ],
     "name": "Pharmacy"
 }
diff --git a/data/presets/presets/footway/crossing.json b/data/presets/presets/footway/crossing.json
index 6c5175e8b..a2154ce1f 100644
--- a/data/presets/presets/footway/crossing.json
+++ b/data/presets/presets/footway/crossing.json
@@ -3,7 +3,7 @@
         "crossing",
         "access",
         "surface",
-        "sloped_curb",
+        "kerb",
         "tactile_paving"
     ],
     "geometry": [
diff --git a/data/presets/presets/footway/crosswalk.json b/data/presets/presets/footway/crosswalk.json
index 5f0a348b3..8c27f214f 100644
--- a/data/presets/presets/footway/crosswalk.json
+++ b/data/presets/presets/footway/crosswalk.json
@@ -4,7 +4,7 @@
         "crossing",
         "access",
         "surface",
-        "sloped_curb",
+        "kerb",
         "tactile_paving"
     ],
     "geometry": [
diff --git a/data/presets/presets/highway/crossing.json b/data/presets/presets/highway/crossing.json
index cd72f6eba..cf8458d2d 100644
--- a/data/presets/presets/highway/crossing.json
+++ b/data/presets/presets/highway/crossing.json
@@ -1,7 +1,7 @@
 {
     "fields": [
         "crossing",
-        "sloped_curb",
+        "kerb",
         "tactile_paving"
     ],
     "geometry": [
diff --git a/data/presets/presets/highway/crosswalk.json b/data/presets/presets/highway/crosswalk.json
index 1ab1960e5..ab8696e0c 100644
--- a/data/presets/presets/highway/crosswalk.json
+++ b/data/presets/presets/highway/crosswalk.json
@@ -1,7 +1,7 @@
 {
     "fields": [
         "crossing",
-        "sloped_curb",
+        "kerb",
         "tactile_paving"
     ],
     "geometry": [
diff --git a/data/presets/presets/shop/chemist.json b/data/presets/presets/shop/chemist.json
index fec98e1c4..f2f710ffc 100644
--- a/data/presets/presets/shop/chemist.json
+++ b/data/presets/presets/shop/chemist.json
@@ -1,5 +1,5 @@
 {
-    "icon": "chemist",
+    "icon": "grocery",
     "fields": [
         "operator",
         "address",
@@ -13,5 +13,10 @@
     "tags": {
         "shop": "chemist"
     },
-    "name": "Chemist"
+    "terms": [
+        "med*",
+        "drug*",
+        "gift"
+    ],
+    "name": "Drugstore"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 8c4ee4d27..b17170191 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1042,6 +1042,9 @@
             "internet_access/fee": {
                 "label": "Internet Access Fee"
             },
+            "kerb": {
+                "label": "Curb Ramp"
+            },
             "lamp_type": {
                 "label": "Type"
             },
@@ -1365,9 +1368,6 @@
             "site": {
                 "label": "Type"
             },
-            "sloped_curb": {
-                "label": "Sloped Curb"
-            },
             "smoking": {
                 "label": "Smoking",
                 "placeholder": "No, Separated, Yes...",
@@ -1814,7 +1814,7 @@
             },
             "amenity/pharmacy": {
                 "name": "Pharmacy",
-                "terms": "drug,medicine"
+                "terms": "drug*,med*,prescription"
             },
             "amenity/place_of_worship": {
                 "name": "Place of Worship",
@@ -3481,8 +3481,8 @@
                 "terms": ""
             },
             "shop/chemist": {
-                "name": "Chemist",
-                "terms": ""
+                "name": "Drugstore",
+                "terms": "med*,drug*,gift"
             },
             "shop/chocolate": {
                 "name": "Chocolate Store",