diff --git a/dbcon/joblist/jlf_execplantojoblist.cpp b/dbcon/joblist/jlf_execplantojoblist.cpp
index 92a25464c..21458fa24 100644
--- a/dbcon/joblist/jlf_execplantojoblist.cpp
+++ b/dbcon/joblist/jlf_execplantojoblist.cpp
@@ -1636,7 +1636,7 @@ const JobStepVector doSimpleFilter(SimpleFilter* sf, JobInfo& jobInfo)
 
         string constval(cc->constval());
         // Because, on a filter, we want to compare ignoring trailing spaces
-        boost::algorithm::trim_right(constval);
+        boost::algorithm::trim_right_if(constval, boost::is_any_of(" "));
 
 
         CalpontSystemCatalog::OID dictOid = 0;
@@ -2773,7 +2773,7 @@ const JobStepVector doConstantFilter(const ConstantFilter* cf, JobInfo& jobInfo)
 
                     string value = cc->constval();
                     // Because, on a filter, we want to compare ignoring trailing spaces
-                    boost::algorithm::trim_right(value);
+                    boost::algorithm::trim_right_if(value, boost::is_any_of(" "));
 
                     pds->addFilter(cop, value);
                 }
@@ -2857,7 +2857,7 @@ const JobStepVector doConstantFilter(const ConstantFilter* cf, JobInfo& jobInfo)
 
                     string value = cc->constval();
                     // Because, on a filter, we want to compare ignoring trailing spaces
-                    boost::algorithm::trim_right(value);
+                    boost::algorithm::trim_right_if(value, boost::is_any_of(" "));
 
                     pds->addFilter(cop, value);
                 }
diff --git a/primitives/linux-port/dictionary.cpp b/primitives/linux-port/dictionary.cpp
index 49ca3cff2..e5a334436 100644
--- a/primitives/linux-port/dictionary.cpp
+++ b/primitives/linux-port/dictionary.cpp
@@ -188,8 +188,7 @@ void PrimitiveProcessor::p_TokenByScan(const TokenByScanRequestHeader* h,
         {
             // MCOL-1246 Trim whitespace before match
             string strData(sig, siglen);
-//            boost::trim_right_if(strData, boost::is_any_of(" "));
-            boost::algorithm::trim_right(strData);
+            boost::trim_right_if(strData, boost::is_any_of(" "));
             bool gotIt = eqFilter->find(strData) != eqFilter->end();
 
             if ((h->COP1 == COMPARE_EQ && gotIt) || (h->COP1 == COMPARE_NE &&