diff --git a/data/presets.yaml b/data/presets.yaml
index bb6feb1f4..fad3328f5 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -7579,7 +7579,7 @@ en:
       shop/car_repair:
         # shop=car_repair
         name: Car Repair Shop
-        # 'terms: automobile,automotive,garage,service'
+        # 'terms: auto mechanic,automechanic,automobile,automotive,garage,inspection,oil change,service'
         terms: '<translate with synonyms or related terms for ''Car Repair Shop'', separated by commas>'
       shop/caravan:
         # shop=caravan
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 3b10369b6..aabfa5a2a 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1056,7 +1056,7 @@
     "shop/candles": {"icon": "fas-burn", "geometry": ["point", "area"], "tags": {"shop": "candles"}, "terms": ["wax"], "name": "Candle Shop"},
     "shop/cannabis": {"icon": "fas-cannabis", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["420", "marijuana", "pot", "reefer", "weed"], "tags": {"shop": "cannabis"}, "name": "Cannabis Shop"},
     "shop/car_parts": {"icon": "fas-car-battery", "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car_parts"}, "name": "Car Parts Store"},
-    "shop/car_repair": {"icon": "maki-car-repair", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["automobile", "automotive", "garage", "service"], "tags": {"shop": "car_repair"}, "name": "Car Repair Shop"},
+    "shop/car_repair": {"icon": "maki-car-repair", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["auto mechanic", "automechanic", "automobile", "automotive", "garage", "inspection", "oil change", "service"], "tags": {"shop": "car_repair"}, "name": "Car Repair Shop"},
     "shop/car": {"icon": "maki-car", "fields": ["name", "brand", "{shop}", "second_hand", "service/vehicle"], "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car"}, "name": "Car Dealership"},
     "shop/car/second_hand": {"icon": "maki-car", "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car", "second_hand": "only"}, "name": "Used Car Dealership"},
     "shop/caravan": {"icon": "temaki-rv_park", "fields": ["name", "brand", "{shop}", "second_hand", "service/vehicle"], "geometry": ["point", "area"], "tags": {"shop": "caravan"}, "terms": ["auto", "camper", "recreational vehicle"], "name": "RV Dealership"},
diff --git a/data/presets/presets/shop/car_repair.json b/data/presets/presets/shop/car_repair.json
index 66a1c03ba..f6225dfd7 100644
--- a/data/presets/presets/shop/car_repair.json
+++ b/data/presets/presets/shop/car_repair.json
@@ -9,9 +9,13 @@
         "area"
     ],
     "terms": [
+        "auto mechanic",
+        "automechanic",
         "automobile",
         "automotive",
         "garage",
+        "inspection",
+        "oil change",
         "service"
     ],
     "tags": {
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 2e35da4e7..e79e489d9 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -9019,7 +9019,7 @@
                 },
                 "shop/car_repair": {
                     "name": "Car Repair Shop",
-                    "terms": "automobile,automotive,garage,service"
+                    "terms": "auto mechanic,automechanic,automobile,automotive,garage,inspection,oil change,service"
                 },
                 "shop/car": {
                     "name": "Car Dealership",