diff --git a/src/Classes/GemSelectControl.lua b/src/Classes/GemSelectControl.lua
index 8155e9868c..37364cd81d 100644
--- a/src/Classes/GemSelectControl.lua
+++ b/src/Classes/GemSelectControl.lua
@@ -115,7 +115,7 @@ function GemSelectClass:PopulateGemList()
 		if (self.sortGemsBy and gemData.tags[self.sortGemsBy] == true or not self.sortGemsBy) then
 			local levelRequirement = gemData.grantedEffect.levels[1].levelRequirement or 1
 			if characterLevel >= levelRequirement or not matchLevel then
-				if (showExceptional or showAll) and gemData.grantedEffect.plusVersionOf then
+				if (showExceptional or showAll) and (gemData.grantedEffect.plusVersionOf or gemData.tagString:match("Exceptional")) then
 					if self.skillsTab.showLegacyGems or not gemData.grantedEffect.legacy then
 						self.gems["Default:" .. gemId] = gemData
 					end
@@ -144,8 +144,8 @@ function GemSelectClass:FilterSupport(gemId, gemData)
 	end
 	return (not gemData.grantedEffect.support
 		or showSupportTypes == "ALL"
-		or (showSupportTypes == "NORMAL" and not gemData.grantedEffect.plusVersionOf)
-		or (showSupportTypes == "EXCEPTIONAL" and gemData.grantedEffect.plusVersionOf))
+		or (showSupportTypes == "NORMAL" and not (gemData.grantedEffect.plusVersionOf or gemData.tagString:match("Exceptional")))
+		or (showSupportTypes == "EXCEPTIONAL" and (gemData.grantedEffect.plusVersionOf or gemData.tagString:match("Exceptional"))))
 		and (self.skillsTab.showAltQualityGems or (not self.skillsTab.showAltQualityGems and self:GetQualityType(gemId) == "Default"))
 end