diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
index f12f87181..8bc0cdf24 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
+++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
@@ -2,6 +2,7 @@
 
 #include "filter_card.h"
 #include "libcockatrice/card/card_localization.h"
+#include <libcockatrice/card/essence_types.h>
 #include "libcockatrice/card/printing/printing_info.h"
 #include "libcockatrice/card/set/card_set.h"
 
@@ -177,23 +178,16 @@ FilterItem::FilterItem(QString trm, FilterItemList *parent) : p(parent), term(st
 
     switch (attr()) {
         case CardFilter::AttrColor: {
-            QString converted = term.trimmed();
-
-            converted.replace("green", "g", Qt::CaseInsensitive);
-            converted.replace("grn", "g", Qt::CaseInsensitive);
-            converted.replace("blue", "u", Qt::CaseInsensitive);
-            converted.replace("blu", "u", Qt::CaseInsensitive);
-            converted.replace("black", "b", Qt::CaseInsensitive);
-            converted.replace("blk", "b", Qt::CaseInsensitive);
-            converted.replace("red", "r", Qt::CaseInsensitive);
-            converted.replace("white", "w", Qt::CaseInsensitive);
-            converted.replace("wht", "w", Qt::CaseInsensitive);
-            converted.replace("colorless", "c", Qt::CaseInsensitive);
-            converted.replace("colourless", "c", Qt::CaseInsensitive);
-            converted.replace("none", "c", Qt::CaseInsensitive);
-
-            converted.replace(QString(" "), QString(""), Qt::CaseInsensitive);
-
+            // The old MTG color-name conversions are invalid for Essence.
+            // N is explicitly colorless; an unspecified identity is not N.
+            QString converted = term.trimmed().toUpper();
+            if (converted == QStringLiteral("COLORLESS") || converted == QStringLiteral("COLOURLESS")) {
+                converted = QStringLiteral("N");
+            }
+            converted.remove(QLatin1Char(' '));
+            converted.remove(QLatin1Char(','));
+            converted.remove(QLatin1Char('{'));
+            converted.remove(QLatin1Char('}'));
             convertedColorTerm = converted;
             break;
         }
@@ -240,8 +234,7 @@ FilterItem::FilterItem(QString trm, FilterItemList *parent) : p(parent), term(st
             break;
         }
         case CardFilter::AttrManaCost:
-            sortedManaCostTerm = term.toUpper();
-            // Sort the mana cost so it will be easy to find
+            sortedManaCostTerm = Essence::parseCost(term.toUpper()).join(QString());
             std::sort(sortedManaCostTerm.begin(), sortedManaCostTerm.end());
             break;
         case CardFilter::AttrLoyalty:
@@ -360,25 +353,16 @@ bool FilterItem::acceptSubType(const CardInfoPtr &info) const
 
 bool FilterItem::acceptColor(const CardInfoPtr &info) const
 {
-    const QString colors = info->getColors();
-
-    // Colorless card filter
-    if (convertedColorTerm.toLower() == "c" && colors.length() < 1) {
-        return true;
+    if (convertedColorTerm.isEmpty()) {
+        return false;
     }
-
-    /*
-     * This is a tricky part, if the filter has multiple colors in it, like UGW,
-     * then we should match all of them to the card's colors
-     */
-    int match_count = 0;
-    for (const QChar &color : convertedColorTerm) {
-        if (colors.contains(color, Qt::CaseInsensitive)) {
-            match_count++;
+    const QString essence = info->getEssenceTypes();
+    for (const QChar code : convertedColorTerm) {
+        if (!Essence::isSymbol(code) || !essence.contains(code)) {
+            return false;
         }
     }
-
-    return match_count == convertedColorTerm.length();
+    return true;
 }
 
 bool FilterItem::acceptText(const CardInfoPtr &info, const CardSearchLanguage &searchLanguage) const
@@ -421,14 +405,13 @@ bool FilterItem::acceptSet(const CardInfoPtr &info) const
 
 bool FilterItem::acceptManaCost(const CardInfoPtr &info) const
 {
-    // Try to seperate the mana cost in case it's a split card
-    // if it's not a split card the loop will run only once
-    for (const QString &manaCostPart : info->getManaCost().split("//")) {
-        QString fullManaCost = manaCostPart;
-        std::sort(fullManaCost.begin(), fullManaCost.end());
-
-        // If the partial is found in the full, return true
-        if (fullManaCost.contains(sortedManaCostTerm)) {
+    if (sortedManaCostTerm.isEmpty()) {
+        return false;
+    }
+    for (const QString &costPart : info->getManaCost().split(QStringLiteral("//"))) {
+        QString sortedCost = Essence::parseCost(costPart).join(QString());
+        std::sort(sortedCost.begin(), sortedCost.end());
+        if (sortedCost.contains(sortedManaCostTerm)) {
             return true;
         }
     }