diff --git a/dbcon/joblist/jlf_execplantojoblist.cpp b/dbcon/joblist/jlf_execplantojoblist.cpp
index f3782c9d5..24ec7f50e 100644
--- a/dbcon/joblist/jlf_execplantojoblist.cpp
+++ b/dbcon/joblist/jlf_execplantojoblist.cpp
@@ -36,6 +36,7 @@ using namespace std;
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/trim.hpp>
 namespace ba = boost::algorithm;
 
 #include "calpontexecutionplan.h"
@@ -1635,6 +1636,7 @@ const JobStepVector doSimpleFilter(SimpleFilter* sf, JobInfo& jobInfo)
         }
 
         string constval(cc->constval());
+        boost::trim_right_if(constval, boost::is_any_of(" "));
 
 
         CalpontSystemCatalog::OID dictOid = 0;
diff --git a/dbcon/joblist/lbidlist.cpp b/dbcon/joblist/lbidlist.cpp
index c317defc9..7852562ef 100644
--- a/dbcon/joblist/lbidlist.cpp
+++ b/dbcon/joblist/lbidlist.cpp
@@ -749,6 +749,7 @@ bool LBIDList::CasualPartitionPredicate(const int64_t Min,
             int64_t tMax = Max;
             dataconvert::DataConvert::trimWhitespace(tMin);
             dataconvert::DataConvert::trimWhitespace(tMax);
+            dataconvert::DataConvert::trimWhitespace(value);
 
             scan = compareVal(order_swap(tMin), order_swap(tMax), order_swap(value),
                               op, lcf);
diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp
index 1094ffc37..e3bf14ad2 100644
--- a/dbcon/mysql/ha_calpont_execplan.cpp
+++ b/dbcon/mysql/ha_calpont_execplan.cpp
@@ -49,6 +49,7 @@ using namespace std;
 
 #include <boost/shared_ptr.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/trim.hpp>
 #include <boost/regex.hpp>
 #include <boost/thread.hpp>
 
@@ -4868,6 +4869,7 @@ void gp_walk(const Item* item, void* arg)
                     {
                         cval.assign(str->ptr(), str->length());
                     }
+//                    boost::trim_right_if(cval, boost::is_any_of(" "));
 
                     gwip->rcWorkStack.push(new ConstantColumn(cval));
                     break;
diff --git a/primitives/primproc/dictstep.cpp b/primitives/primproc/dictstep.cpp
index abd99ada3..47bfeac25 100644
--- a/primitives/primproc/dictstep.cpp
+++ b/primitives/primproc/dictstep.cpp
@@ -30,6 +30,7 @@
 
 #include <unistd.h>
 #include <algorithm>
+#include <boost/algorithm/string/trim.hpp>
 
 #include "bpp.h"
 #include "primitiveserver.h"
@@ -93,6 +94,7 @@ void DictStep::createCommand(ByteStream& bs)
         for (uint32_t i = 0; i < filterCount; i++)
         {
             bs >> strTmp;
+            boost::trim_right_if(strTmp, boost::is_any_of(" "));
             //cout << "  " << strTmp << endl;
             eqFilter->insert(strTmp);
         }
diff --git a/primitives/primproc/primitiveserver.cpp b/primitives/primproc/primitiveserver.cpp
index 76ff8ef3c..9359556e9 100644
--- a/primitives/primproc/primitiveserver.cpp
+++ b/primitives/primproc/primitiveserver.cpp
@@ -28,6 +28,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdexcept>
+#include <boost/algorithm/string/trim.hpp>
 //#define NDEBUG
 #include <cassert>
 #include <boost/thread.hpp>
@@ -1804,6 +1805,7 @@ private:
         for (i = 0; i < count; i++)
         {
             *bs >> str;
+            boost::trim_right_if(str, boost::is_any_of(" "));
             filter->insert(str);
         }