diff --git a/dbcon/execplan/predicateoperator.h b/dbcon/execplan/predicateoperator.h
index b83931394..08f0c40cf 100644
--- a/dbcon/execplan/predicateoperator.h
+++ b/dbcon/execplan/predicateoperator.h
@@ -36,6 +36,7 @@
 #endif
 #include <cstring>
 #include <boost/regex.hpp>
+#include <boost/algorithm/string/trim.hpp>
 
 #include "expressionparser.h"
 #include "returnedcolumn.h"
@@ -456,16 +457,20 @@ inline bool PredicateOperator::getBoolVal(rowgroup::Row& row, bool& isNull, Retu
                 return !ret;
             }
 
+            // MCOL-1559
+	    std::string val1 = lop->getStrVal(row, isNull);
             if (isNull)
                 return false;
 
-            const std::string& val1 = lop->getStrVal(row, isNull);
-
+            std::string val2 = rop->getStrVal(row, isNull);
             if (isNull)
                 return false;
 
-            return strCompare(val1, rop->getStrVal(row, isNull)) && !isNull;
-        }
+            boost::trim_right_if(val1, boost::is_any_of(" "));
+            boost::trim_right_if(val2, boost::is_any_of(" "));
+
+            return strCompare(val1, val2);
+	}
 
         //FIXME: ???
         case execplan::CalpontSystemCatalog::VARBINARY:
diff --git a/dbcon/joblist/jlf_execplantojoblist.cpp b/dbcon/joblist/jlf_execplantojoblist.cpp
index f3782c9d5..fff1b12fb 100644
--- a/dbcon/joblist/jlf_execplantojoblist.cpp
+++ b/dbcon/joblist/jlf_execplantojoblist.cpp
@@ -1636,7 +1636,6 @@ const JobStepVector doSimpleFilter(SimpleFilter* sf, JobInfo& jobInfo)
 
         string constval(cc->constval());
 
-
         CalpontSystemCatalog::OID dictOid = 0;
         CalpontSystemCatalog::ColType ct = sc->colType();
         const PseudoColumn* pc = dynamic_cast<const PseudoColumn*>(sc);
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/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);
         }