diff --git a/README.md b/README.md
index 13da10b0a..b9b770b37 100644
--- a/README.md
+++ b/README.md
@@ -271,7 +271,7 @@ and which gives information about the app for the Launcher.
                               //   'locale' - provides 'locale' library for language-specific date/distance/etc
                               //              (a version of 'locale' is included in the firmware)
                               //   'defaultconfig' - a set of apps that will can be installed and will wipe out all previously installed apps
-  "tags": "",                 // comma separated tag list for searching
+  "tags": "",                 // comma separated tag list for searching (don't include uppercase or spaces)
                               // common types are:
                               //   'clock' - it's a clock
                               //   'widget' - it is (or provides) a widget
diff --git a/apps/UI4swatch/metadata.json b/apps/UI4swatch/metadata.json
index bcb0e6c51..5b4abf406 100644
--- a/apps/UI4swatch/metadata.json
+++ b/apps/UI4swatch/metadata.json
@@ -5,7 +5,7 @@
   "version": "0.02",
   "description": "A UI/UX for espruino smartwatches, displays dinamically calc. x,y coordinates.",
   "icon": "app.png",
-  "tags": "Color,input,buttons,touch,UI",
+  "tags": "color,input,buttons,touch,ui",
   "supports": ["BANGLEJS"],
   "readme": "README.md",
   "screenshots": [{"url":"UI4swatch_icon.png"},{"url":"UI4swatch_s1.png"}],
diff --git a/apps/Uke/metadata.json b/apps/Uke/metadata.json
index 5a3f17639..1185c7202 100644
--- a/apps/Uke/metadata.json
+++ b/apps/Uke/metadata.json
@@ -4,8 +4,8 @@
   "version": "0.04",
   "description": "Wrist mounted ukulele chords",
   "icon": "app.png",
-  "tags": "uke, chords",
-  "supports" : ["BANGLEJS2"],  
+  "tags": "uke,chords",
+  "supports" : ["BANGLEJS2"],
   "readme": "README.md",
   "storage": [
     {"name":"Uke.app.js","url":"app.js"},
diff --git a/apps/bblobface/metadata.json b/apps/bblobface/metadata.json
index 6af247c91..8393755b0 100644
--- a/apps/bblobface/metadata.json
+++ b/apps/bblobface/metadata.json
@@ -6,7 +6,7 @@
   "description": "A fully featured watch face with a playable game on the side.",
   "readme":"README.md",
   "type": "clock",
-  "tags": "clock, game",
+  "tags": "clock,game",
   "supports" : ["BANGLEJS2"],
   "storage": [
     {"name":"bblobface.app.js","url":"app.js"},
diff --git a/apps/beeptest/metadata.json b/apps/beeptest/metadata.json
index a9856bc93..7c25a3848 100644
--- a/apps/beeptest/metadata.json
+++ b/apps/beeptest/metadata.json
@@ -5,7 +5,7 @@
   "version": "0.01",
   "description": "Aerobic fitness test created by Léger & Lambert",
   "icon": "beeptest.png",
-  "tags": "Health",
+  "tags": "health",
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
   "storage": [
diff --git a/apps/bordle/metadata.json b/apps/bordle/metadata.json
index f6011f798..0dbcf09f9 100644
--- a/apps/bordle/metadata.json
+++ b/apps/bordle/metadata.json
@@ -6,7 +6,7 @@
   "description": "Bangle version of a popular word search game",
   "supports" : ["BANGLEJS2"],
   "readme": "README.md",
-  "tags": "game, text",
+  "tags": "game,text",
   "storage": [
     {"name":"bordle.app.js","url":"bordle.app.js"},
     {"name":"wordlencr.txt","url":"wordlencr.txt"},
diff --git a/apps/calclock/metadata.json b/apps/calclock/metadata.json
index c339e8ce0..31dcb88d0 100644
--- a/apps/calclock/metadata.json
+++ b/apps/calclock/metadata.json
@@ -6,7 +6,7 @@
   "description": "Show the current and upcoming events synchronized from Gadgetbridge",
   "icon": "calclock.png",
   "type": "clock",
-  "tags": "clock agenda",
+  "tags": "clock,agenda",
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
   "storage": [
diff --git a/apps/cassioWatch/metadata.json b/apps/cassioWatch/metadata.json
index fb7dfd401..5ec12e751 100644
--- a/apps/cassioWatch/metadata.json
+++ b/apps/cassioWatch/metadata.json
@@ -6,7 +6,7 @@
   "icon": "app.png",
   "version": "0.13",
   "type": "clock",
-  "tags": "clock, weather, cassio, retro",
+  "tags": "clock,weather,cassio,retro",
   "supports": ["BANGLEJS2"],
   "allow_emulator": true,
   "readme": "README.md",
diff --git a/apps/chronlog/metadata.json b/apps/chronlog/metadata.json
index 8ed618b27..50a9166bf 100644
--- a/apps/chronlog/metadata.json
+++ b/apps/chronlog/metadata.json
@@ -3,7 +3,7 @@
   "version":"0.01",
   "description": "Record time active on a task, course, work or anything really.",
   "icon": "app.png",
-  "tags": "logging, record, work, tasks",
+  "tags": "logging,record,work,tasks",
   "supports" : ["BANGLEJS2"],
   "readme": "README.md",
   "screenshots" : [ { "url":"dump.png"}, { "url":"dump1.png" }, { "url":"dump2.png" }, { "url":"dump3.png" }, { "url":"dump4.png" }, { "url":"dump5.png" }, { "url":"dump6.png" } ],
diff --git a/apps/color_catalog/metadata.json b/apps/color_catalog/metadata.json
index 4d49308ef..e445e3175 100644
--- a/apps/color_catalog/metadata.json
+++ b/apps/color_catalog/metadata.json
@@ -5,7 +5,7 @@
   "version": "0.03",
   "description": "Displays RGB565 and RGB888 colors, its name and code in screen.",
   "icon": "app.png",
-  "tags": "Color,input,buttons,touch,UI",
+  "tags": "color,input,buttons,touch,ui",
   "supports": ["BANGLEJS"],
   "readme": "README.md",
   "storage": [
diff --git a/apps/delaylock/metadata.json b/apps/delaylock/metadata.json
index dff4d9219..7441d822b 100644
--- a/apps/delaylock/metadata.json
+++ b/apps/delaylock/metadata.json
@@ -3,7 +3,7 @@
   "version":"0.01",
   "description": "Delay the locking of the screen to 5 seconds after the backlight turns off.",
   "icon": "app.png",
-  "tags": "settings, configuration, backlight, touchscreen, screen",
+  "tags": "settings,configuration,backlight,touchscreen,screen",
   "type": "bootloader",
   "supports" : ["BANGLEJS2"],
   "readme": "README.md",
diff --git a/apps/dinoClock/metadata.json b/apps/dinoClock/metadata.json
index a61ce122b..1455e84a6 100644
--- a/apps/dinoClock/metadata.json
+++ b/apps/dinoClock/metadata.json
@@ -6,7 +6,7 @@
   "icon": "app.png",
   "version": "0.01",
   "type": "clock",
-  "tags": "clock, weather, dino, trex, chrome",
+  "tags": "clock,weather,dino,trex,chrome",
   "supports": ["BANGLEJS2"],
   "allow_emulator": true,
   "readme": "README.md",
diff --git a/apps/followtherecipe/metadata.json b/apps/followtherecipe/metadata.json
index 0c1de0817..59fabc8c5 100644
--- a/apps/followtherecipe/metadata.json
+++ b/apps/followtherecipe/metadata.json
@@ -6,7 +6,7 @@
   "version": "0.02",
   "description": "Follow The Recipe (FTR) is a bangle.js app to follow a recipe step by step",
   "type": "app",
-  "tags": "tool, tools, cook",
+  "tags": "tool,tools,cook",
   "supports": [
     "BANGLEJS2"
   ],
diff --git a/apps/gassist/metadata.json b/apps/gassist/metadata.json
index 995c44adb..bd38cdfb8 100644
--- a/apps/gassist/metadata.json
+++ b/apps/gassist/metadata.json
@@ -5,7 +5,7 @@
   "description": "A simple way to initiate Google Assistant on Android. Intents must be enabled in  Gadgetbridge.",
   "icon": "app.png",
   "type": "app",
-  "tags": "tool, voice, tasker",
+  "tags": "tool,voice,tasker",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "allow_emulator": false,
   "storage": [
diff --git a/apps/gbdiscon/metadata.json b/apps/gbdiscon/metadata.json
index ecc92d01c..904b4c6a2 100644
--- a/apps/gbdiscon/metadata.json
+++ b/apps/gbdiscon/metadata.json
@@ -4,7 +4,7 @@
   "version":"0.01",
   "description": "Disconnect from your android device by running this app. The app will forward you to your clock face immediately after triggering the command. (Gadgetbridge nightly required until version 82 is released)",
   "icon": "app.png",
-  "tags": "android, gadgetbridge, bluetooth, bt",
+  "tags": "android,gadgetbridge,bluetooth,bt",
   "supports" : ["BANGLEJS", "BANGLEJS2"],
   "storage": [
     {"name":"gbdiscon.app.js","url":"app.js"},
diff --git a/apps/golfview/metadata.json b/apps/golfview/metadata.json
index bc3a00f90..cf77f3a26 100644
--- a/apps/golfview/metadata.json
+++ b/apps/golfview/metadata.json
@@ -3,9 +3,9 @@
   "version": "0.03",
   "description": "This app will provide you with on course data to support your golf game!",
   "icon": "golfview.png",
-  "tags": "outdoors, gps",
+  "tags": "outdoors,gps",
   "allow_emulator": true,
-  "supports" : ["BANGLEJS2"],  
+  "supports" : ["BANGLEJS2"],
   "readme": "README.md",
   "custom": "custom.html",
   "storage": [
diff --git a/apps/guitar/metadata.json b/apps/guitar/metadata.json
index 0dc6893d6..7b4683c47 100644
--- a/apps/guitar/metadata.json
+++ b/apps/guitar/metadata.json
@@ -4,8 +4,8 @@
   "version": "0.03",
   "description": "Wrist mounted guitar chords",
   "icon": "app.png",
-  "tags": "guitar, chords",
-  "supports" : ["BANGLEJS2"],  
+  "tags": "guitar,chords",
+  "supports" : ["BANGLEJS2"],
   "readme": "README.md",
   "storage": [
     {"name":"guitar.app.js","url":"app.js"},
diff --git a/apps/guitarsongs/metadata.json b/apps/guitarsongs/metadata.json
index 242850a70..18e1f7146 100644
--- a/apps/guitarsongs/metadata.json
+++ b/apps/guitarsongs/metadata.json
@@ -5,7 +5,7 @@
   "description": "Songs lyrics and guitar chords",
   "icon": "app.png",
   "screenshots": [{"url": "screenshot.png"}],
-  "tags": "guitar, song, lyrics, chords",
+  "tags": "guitar,song,lyrics,chords",
   "supports" : ["BANGLEJS2"],
   "interface": "manage_songs.html",
   "readme": "README.md",
diff --git a/apps/intervalTimer/metadata.json b/apps/intervalTimer/metadata.json
index 2722473c1..a0489833c 100644
--- a/apps/intervalTimer/metadata.json
+++ b/apps/intervalTimer/metadata.json
@@ -5,7 +5,7 @@
   "icon": "app.png",
   "version":"0.01",
   "description": "Interval Timer for workouts, HIIT, or whatever else.",
-  "tags": "timer, interval, hiit, workout",
+  "tags": "timer,interval,hiit,workout",
   "readme":"README.md",
   "supports":["BANGLEJS2"],
   "storage": [
diff --git a/apps/kanagsec/metadata.json b/apps/kanagsec/metadata.json
index c00ec9d7a..2e3376c5b 100644
--- a/apps/kanagsec/metadata.json
+++ b/apps/kanagsec/metadata.json
@@ -1,23 +1,23 @@
-{ 
+{
 	"id": "kanagsec",
 	"name": "Kanagawa clock",
 	"shortName":"kanagawa",
 	"version": "0.04",
 	"description": "A clock that displays the great wave of kanagawa (image from wikipedia) with seconds in active mode.",
 	"icon": "app.png",
-	"tags": "clock, kanagawa, wave",
+	"tags": "clock,kanagawa,wave",
 	"type": "clock",
-	"supports" : ["BANGLEJS2"],  
+	"supports" : ["BANGLEJS2"],
 	"readme": "README.md",
 	"allow_emulator":true,
-	"storage": 
+	"storage":
 	[
 		{"name":"kanagsec.app.js","url":"app.js"},
 		{"name":"kanagsec.img","url":"app-icon.js","evaluate":true}
 	],
-	"screenshots" : 
+	"screenshots" :
 	[
 		{ "url":"screenshot.png" },
-		{ "url":"screenshot2.png" } 
+		{ "url":"screenshot2.png" }
 	]
 }
\ No newline at end of file
diff --git a/apps/ohmcalc/metadata.json b/apps/ohmcalc/metadata.json
index c72727a4c..2ab25947f 100644
--- a/apps/ohmcalc/metadata.json
+++ b/apps/ohmcalc/metadata.json
@@ -6,7 +6,7 @@
   "description": "A smart and simple calculator for Ohm's Law calculations, designed specifically for Bangle.js 2 smartwatches. Handles voltage, current, resistance, and power calculations with smart logic to prevent invalid inputs.",
   "icon": "app.png",
   "type": "app",
-  "tags": "calculator, utilities, electric",
+  "tags": "calculator,utilities,electric",
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
   "allow_emulator": true,
diff --git a/apps/pastel/metadata.json b/apps/pastel/metadata.json
index 532aa8ccc..5d1f925fe 100644
--- a/apps/pastel/metadata.json
+++ b/apps/pastel/metadata.json
@@ -8,7 +8,7 @@
   "dependencies": {"mylocation":"app","weather":"app"},
   "screenshots": [{"url":"screenshot_pastel.png"}, {"url":"weather_icons.png"}],
   "type": "clock",
-  "tags": "clock, weather, tool",
+  "tags": "clock,weather,tool",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "storage": [
diff --git a/apps/poweroff/metadata.json b/apps/poweroff/metadata.json
index 218e4b441..b9a7d60ea 100644
--- a/apps/poweroff/metadata.json
+++ b/apps/poweroff/metadata.json
@@ -4,7 +4,7 @@
 "version": "0.05",
 "description": "Simple app to power off your Bangle.js",
 "icon": "app.png",
-"tags": "tool, poweroff, shutdown",
+"tags": "tool,poweroff,shutdown",
 "supports" : ["BANGLEJS", "BANGLEJS2"],
 "readme": "README.md",
 "allow_emulator": true,
diff --git a/apps/quicklaunch/metadata.json b/apps/quicklaunch/metadata.json
index 15c40dfdc..95ae0b014 100644
--- a/apps/quicklaunch/metadata.json
+++ b/apps/quicklaunch/metadata.json
@@ -5,7 +5,7 @@
   "version": "0.16",
   "description": "Tap or swipe left/right/up/down on your clock face to launch up to five apps of your choice. Configurations can be accessed through Settings->Apps.",
   "type": "bootloader",
-  "tags": "tools, system",
+  "tags": "tools,system",
   "readme": "README.md",
   "supports": ["BANGLEJS2"],
   "storage": [
diff --git a/apps/rescalc/metadata.json b/apps/rescalc/metadata.json
index cd2b7ea31..f7f7c5e29 100644
--- a/apps/rescalc/metadata.json
+++ b/apps/rescalc/metadata.json
@@ -10,7 +10,7 @@
     {"url": "screenshot-2.png"}
   ],
   "description": "An intuitive, easy-to-use app that aids in the interpretation of resistor color codes and calculation of resistance values.",
-  "tags": "app, tool, electricity, ohms, converter",
+  "tags": "app,tool,electricity,ohms,converter",
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
   "allow_emulator": true,
diff --git a/apps/scribble/metadata.json b/apps/scribble/metadata.json
index 2c31be931..19c6c707c 100644
--- a/apps/scribble/metadata.json
+++ b/apps/scribble/metadata.json
@@ -6,7 +6,7 @@
   "description": "A keyboard on your wrist! Swipe right for space, left for delete.",
   "icon": "app.png",
   "allow_emulator": true,
-  "tags": "tools, keyboard, text, scribble",
+  "tags": "tools,keyboard,text,scribble",
   "supports" : ["BANGLEJS2"],
   "readme": "README.md",
   "storage": [
diff --git a/apps/sevenmin/metadata.json b/apps/sevenmin/metadata.json
index 5103a5f97..8a1867e4a 100644
--- a/apps/sevenmin/metadata.json
+++ b/apps/sevenmin/metadata.json
@@ -5,7 +5,7 @@
   "description": "A basic implementation of the famous consice workout",
   "icon": "icon.png",
   "type":"app",
-  "tags": "Training, Workout",
+  "tags": "training,workout",
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
   "allow_emulator":true,
diff --git a/apps/spaceclock/metadata.json b/apps/spaceclock/metadata.json
index 1e8bc266f..cff458d08 100644
--- a/apps/spaceclock/metadata.json
+++ b/apps/spaceclock/metadata.json
@@ -5,8 +5,8 @@
   "description": "Watch face in the style of Casio Prototype Space Resist",
   "icon": "app-icon.png",
   "type": "clock",
-  "tags": "clock, casio, retro",
-  "supports" : ["BANGLEJS2"],  
+  "tags": "clock,casio,retro",
+  "supports" : ["BANGLEJS2"],
   "readme": "README.md",
   "storage": [
     {"name":"spaceclock.app.js","url":"app.js"},
diff --git a/apps/swiperclocklaunch/metadata.json b/apps/swiperclocklaunch/metadata.json
index d474b38e3..6bb24987e 100644
--- a/apps/swiperclocklaunch/metadata.json
+++ b/apps/swiperclocklaunch/metadata.json
@@ -5,7 +5,7 @@
   "description": "Navigate between clock and launcher with Swipe action",
   "icon": "swiperclocklaunch.png",
   "type": "bootloader",
-  "tags": "tools, system",
+  "tags": "tools,system",
   "supports": ["BANGLEJS", "BANGLEJS2"],
   "storage": [
     {"name":"swiperclocklaunch.boot.js","url":"boot.js"},
diff --git a/apps/tabanchi/metadata.json b/apps/tabanchi/metadata.json
index db81707b5..43ebc62ac 100644
--- a/apps/tabanchi/metadata.json
+++ b/apps/tabanchi/metadata.json
@@ -7,7 +7,7 @@
   "description": "Tamagotchi WatchApp",
   "icon": "app.png",
   "allow_emulator": true,
-  "tags": "clock, watch, virtual pet",
+  "tags": "clock,watch,virtualpet",
   "supports": [
     "BANGLEJS2"
   ],
diff --git a/apps/testuserinput/metadata.json b/apps/testuserinput/metadata.json
index 409843198..39fab86af 100644
--- a/apps/testuserinput/metadata.json
+++ b/apps/testuserinput/metadata.json
@@ -5,7 +5,7 @@
   "version": "0.08",
   "description": "App to test the bangle.js input interface. It displays the user action in text, circle buttons or on/off switch UI elements.",
   "icon": "app.png",
-  "tags": "input,interface,buttons,touch,UI",
+  "tags": "input,interface,buttons,touch,ui",
   "supports": ["BANGLEJS"],
   "readme": "README.md",
   "storage": [
diff --git a/apps/timestamplog/metadata.json b/apps/timestamplog/metadata.json
index e1aa0eb23..6f0126c4a 100644
--- a/apps/timestamplog/metadata.json
+++ b/apps/timestamplog/metadata.json
@@ -7,7 +7,7 @@
   "description": "Conveniently record a series of date/time stamps",
   "screenshots": [ {"url": "screenshot.png" } ],
   "readme": "README.md",
-  "tags": "timestamp, log",
+  "tags": "timestamp,log",
   "supports": ["BANGLEJS2"],
   "interface": "interface.html",
   "storage": [
diff --git a/apps/tinydraw/metadata.json b/apps/tinydraw/metadata.json
index 21ea1eb89..61f4129e8 100644
--- a/apps/tinydraw/metadata.json
+++ b/apps/tinydraw/metadata.json
@@ -6,7 +6,7 @@
   "description": "Draw stuff in your wrist",
   "icon": "app.png",
   "allow_emulator": true,
-  "tags": "tools, keyboard, text, scribble",
+  "tags": "tools,keyboard,text,scribble",
   "supports" : ["BANGLEJS2"],
   "readme": "README.md",
   "storage": [
diff --git a/apps/weatherClock/metadata.json b/apps/weatherClock/metadata.json
index 88057c8dd..b1b586a21 100644
--- a/apps/weatherClock/metadata.json
+++ b/apps/weatherClock/metadata.json
@@ -8,7 +8,7 @@
   "dependencies": {"weather":"app"},
   "screenshots": [{"url":"screens/screen1.png"}],
   "type": "clock",
-  "tags": "clock, weather",
+  "tags": "clock,weather",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "allow_emulator": true,
   "readme": "README.md",
diff --git a/apps/widscrlock/metadata.json b/apps/widscrlock/metadata.json
index 5110d76c1..568c61b93 100644
--- a/apps/widscrlock/metadata.json
+++ b/apps/widscrlock/metadata.json
@@ -3,9 +3,9 @@
   "shortName":"Screenlock",
   "version":"0.03",
   "description": "Lock a Bangle 2 screen by tapping a widget.",
-  "icon": "widget.png",  
+  "icon": "widget.png",
   "type": "widget",
-  "tags": "widget, screenlock",
+  "tags": "widget,screenlock",
   "supports" : ["BANGLEJS2"],
   "readme": "README.md",
   "storage": [
diff --git a/bin/sanitycheck.js b/bin/sanitycheck.js
index 80f8abe24..5432999eb 100755
--- a/bin/sanitycheck.js
+++ b/bin/sanitycheck.js
@@ -207,10 +207,10 @@ apps.forEach((app,appIdx) => {
   if (!app.name) ERROR(`App ${app.id} has no name`, {file:metadataFile});
   var isApp = !app.type || app.type=="app";
   var appTags = app.tags ? app.tags.split(",") : [];
-  /*if (appTags.some(tag => tag!=tag.trim()))
+  if (appTags.some(tag => tag!=tag.trim()))
     WARN(`App ${app.id} 'tag' list contains whitespace ("${app.tags}")`, {file:metadataFile});
   if (appTags.some(tag => tag!=tag.toLowerCase()))
-    WARN(`App ${app.id} 'tag' list contains uppercase ("${app.tags}")`, {file:metadataFile});*/
+    WARN(`App ${app.id} 'tag' list contains uppercase ("${app.tags}")`, {file:metadataFile});
   if (app.name.length>20 && !app.shortName && isApp) ERROR(`App ${app.id} has a long name, but no shortName`, {file:metadataFile});
   if (app.type && !METADATA_TYPES.includes(app.type))
     ERROR(`App ${app.id} 'type' is one one of `+METADATA_TYPES, {file:metadataFile});