diff --git a/public/json/se_monsters.json b/public/json/se_monsters.json
index a503667..1077862 100644
--- a/public/json/se_monsters.json
+++ b/public/json/se_monsters.json
@@ -1517,7 +1517,7 @@
     "cr": "1/4",
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "Aarakocra",
+    "tags": "",
     "section": "",
     "alignment": "neutral good",
     "environment": "mountain, planar",
@@ -1568,7 +1568,7 @@
     "cr": "1/4",
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "any",
     "environment": "arctic, desert, dungeon, forest, grassland, mountain, swamp, underground, urban",
@@ -2078,7 +2078,7 @@
     "cr": 12,
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "any",
     "environment": "ruins, urban",
@@ -2095,7 +2095,7 @@
     "cr": 8,
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "non-good",
     "environment": "arctic, cave, coast, desert, dungeon, forest, grassland, mountain, ruins, swamp, underground, urban",
@@ -2231,7 +2231,7 @@
     "cr": "1/8",
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "non-lawful",
     "environment": "arctic, coast, desert, forest, grassland, mountain, ruins, urban",
@@ -2248,7 +2248,7 @@
     "cr": 2,
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "non-lawful",
     "environment": "arctic, coast, desert, forest, grassland, mountain, ruins, urban",
@@ -2435,7 +2435,7 @@
     "cr": 2,
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "any chaotic",
     "environment": "arctic, cave, desert, forest, grassland, mountain, swamp, urban",
@@ -2962,7 +2962,7 @@
     "cr": 0,
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "any",
     "environment": "urban",
@@ -3081,7 +3081,7 @@
     "cr": 2,
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "non-good",
     "environment": "dungeon, urban",
@@ -3098,7 +3098,7 @@
     "cr": "1/8",
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "non-good",
     "environment": "dungeon, urban",
@@ -3574,7 +3574,7 @@
     "cr": 2,
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "any",
     "environment": "arctic, cave, coast, desert, forest, grassland, mountain, swamp, underground",
@@ -4815,7 +4815,7 @@
     "cr": 5,
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "any",
     "environment": "urban",
@@ -5172,7 +5172,7 @@
     "cr": "1/8",
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "any",
     "environment": "urban",
@@ -5699,7 +5699,7 @@
     "cr": 3,
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "any",
     "environment": "urban",
@@ -5971,7 +5971,7 @@
     "cr": 6,
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "any",
     "environment": "urban",
@@ -6498,7 +6498,7 @@
     "cr": "1/8",
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "any",
     "environment": "urban",
@@ -6991,7 +6991,7 @@
     "cr": 2,
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "any",
     "environment": "urban",
@@ -7535,7 +7535,7 @@
     "cr": "1/2",
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "any",
     "environment": "arctic, coast, desert, forest, grassland, mountain, swamp",
@@ -7875,7 +7875,7 @@
     "cr": 1,
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "any",
     "environment": "arctic, cave, coast, desert, forest, grassland, mountain, ruins, swamp, urban",
@@ -8130,7 +8130,7 @@
     "cr": "1/2",
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "non-good",
     "environment": "arctic, cave, coast, forest, grassland, urban",
@@ -8181,7 +8181,7 @@
     "cr": "1/8",
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "any",
     "environment": "arctic, cave, desert, forest, grassland, mountain, swamp",
@@ -8419,7 +8419,7 @@
     "cr": 3,
     "size": "Medium",
     "type": "Humanoid",
-    "tags": "any",
+    "tags": "any race",
     "section": "NPCs",
     "alignment": "any",
     "environment": "urban",
diff --git a/src/components/Badge.vue b/src/components/Badge.vue
new file mode 100644
index 0000000..a078942
--- /dev/null
+++ b/src/components/Badge.vue
@@ -0,0 +1,30 @@
+<script setup>
+
+const props = defineProps({
+  color: {
+    type: String,
+    default: "emerald"
+  },
+})
+
+</script>
+
+<template>
+  <!-- Colors: emerald, gray, red, green, yellow, blue, indigo, purple, pink -->
+  <span
+    :class="{
+      'inline-flex items-center rounded-md px-1.5 py-0.5 text-xs font-medium ring-1 ring-inset': true,
+      'bg-emerald-50 text-emerald-700 ring-emerald-600/10 dark:bg-emerald-400/10 dark:text-gray-400 dark:ring-gray-400/20': color === 'emerald',
+      'bg-gray-50 text-gray-700 ring-gray-600/10 dark:bg-gray-400/10 dark:text-gray-400 dark:ring-gray-400/20': color === 'gray',
+      'bg-red-50 text-red-700 ring-red-600/10 dark:bg-red-400/10 dark:text-gray-400 dark:ring-gray-400/20': color === 'red',
+      'bg-green-50 text-green-700 ring-green-600/10 dark:bg-green-500/10 dark:text-gray-400 dark:ring-gray-500/20': color === 'green',
+      'bg-yellow-50 text-yellow-800 ring-yellow-600/10 dark:bg-yellow-400/10 dark:text-gray-500 dark:ring-gray-400/20': color === 'yellow',
+      'bg-blue-50 text-blue-700 ring-blue-600/10 dark:bg-blue-400/10 dark:text-gray-400 dark:ring-gray-400/20': color === 'blue',
+      'bg-indigo-50 text-indigo-700 ring-indigo-600/10 dark:bg-indigo-400/10 dark:text-gray-400 dark:ring-gray-400/20': color === 'indigo',
+      'bg-purple-50 text-purple-700 ring-purple-600/10 dark:bg-purple-400/10 dark:text-gray-400 dark:ring-gray-400/20': color === 'purple',
+      'bg-pink-50 text-pink-700 ring-pink-600/10 dark:bg-pink-400/10 dark:text-gray-400 dark:ring-gray-400/20': color === 'pink',
+    }"
+  >
+    <slot></slot>
+  </span>
+</template>
diff --git a/src/components/MonsterTableRow.vue b/src/components/MonsterTableRow.vue
index fc06e31..5353075 100644
--- a/src/components/MonsterTableRow.vue
+++ b/src/components/MonsterTableRow.vue
@@ -1,6 +1,7 @@
 <script setup>
 import {useEncounter} from "../stores/encounter";
 import Monster from "../js/monster";
+import Badge from "./Badge.vue";
 
 const props = defineProps({
   monster: {
@@ -29,6 +30,11 @@ const encounter = useEncounter();
       class="w-full max-w-0 py-2 px-3 text-sm font-medium text-gray-900 dark:text-gray-100 w-64 max-w-64 truncate"
     >
       <span class="truncate" v-text="monster.name"></span>
+      <span v-show="monster.tags.length" class="inline-flex space-x-1 ml-2">
+        <Badge v-for="tag in monster.tags">
+          {{ tag.toLowerCase() }}
+        </Badge>
+      </span>
       <dl class="font-normal">
         <dt class="sr-only">Sources</dt>
         <dd class="mt-1 truncate text-gray-500 dark:text-gray-400">
diff --git a/src/js/monster.js b/src/js/monster.js
index 171a766..a3bd3f9 100644
--- a/src/js/monster.js
+++ b/src/js/monster.js
@@ -21,8 +21,8 @@ export default class Monster {
     );
 
     this.tags = attributes.tags
-      ? attributes.tags.split(/\s*,\s*/).sort()
-      : null;
+      ? attributes.tags.split(/\s*,\s*/)
+      : [];
 
     this.special = !!attributes.special;
     this.legendary = !!attributes.legendary;