diff --git a/src/Modules/CalcTools.lua b/src/Modules/CalcTools.lua
index a7efd459..7adf69f1 100644
--- a/src/Modules/CalcTools.lua
+++ b/src/Modules/CalcTools.lua
@@ -113,6 +113,7 @@ function calcLib.gemIsType(gem, type, includeTransfigured)
 			(type == "trap or mine" and (gem.tags.trap or gem.tags.mine)) or
 			((type == "active skill" or type == "grants_active_skill" or type == "skill") and gem.tags.grants_active_skill and not gem.tags.support) or
 			(type == "non-vaal" and not gem.tags.vaal) or
+			(type == "non-exceptional" and not gem.tags.exceptional) or
 			(type == gem.name:lower()) or
 			(type == gem.name:lower():gsub("^vaal ", "")) or
 			(includeTransfigured and calcLib.isGemIdSame(gem.name, type, true)) or
diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua
index fea17cba..ef2e7365 100644
--- a/src/Modules/ModParser.lua
+++ b/src/Modules/ModParser.lua
@@ -2873,7 +2873,7 @@ local specialModList = {
 			return { mod("GemProperty", "LIST", {keyword = skill, key = "level", value = num }) }
 		end
 		local wordList = {}
-		for tag in skill:gmatch("%w+") do
+		for tag in skill:gmatch("%S+") do
 			table.insert(wordList, tag)
 		end
 		return { mod("GemProperty", "LIST", {keywordList = wordList, key = property, value = num }) }