diff --git a/QueryFilter/Propel2QueryFilter b/QueryFilter/Propel2QueryFilter
new file mode 100644
index 00000000..6a2dd8bc
--- /dev/null
+++ b/QueryFilter/Propel2QueryFilter
@@ -0,0 +1,35 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\QueryFilter;
+
+use Propel\Runtime\ActiveQuery\Criteria;
+use Doctrine\Common\Util\Inflector;
+
+class Propel2QueryFilter extends PropelQueryFilter
+{
+
+    public function addDefaultFilter($field, $value, $criteria = null)
+    {
+        list($query, $filteredField) = $this->addTablePathToField($field);
+
+        if (!is_array($value)) {
+            $method = 'filterBy'.Inflector::classify($filteredField);
+            $query->$method($value, $criteria);
+        } elseif (count($value) > 0) {
+            $query->filterBy($filteredField, $value, Criteria::IN);
+        }
+    }
+
+    public function addBooleanFilter($field, $value)
+    {
+        if ("" !== $value) {
+            $this->addDefaultFilter($field, $value);
+        }
+    }
+
+    public function addVarcharFilter($field, $value)
+    {
+        $this->addDefaultFilter($field, '%'.$value.'%',  Criteria::LIKE);
+    }
+    
+}
diff --git a/Resources/config/propel2.xml b/Resources/config/propel2.xml
index 404eebae..a9820a90 100644
--- a/Resources/config/propel2.xml
+++ b/Resources/config/propel2.xml
@@ -6,7 +6,7 @@
         <!-- Propel -->
         <parameter key="admingenerator.propel2.class">Admingenerator\GeneratorBundle\Generator\PropelGenerator</parameter>
         <parameter key="admingenerator.fieldguesser.propel2.class">Admingenerator\GeneratorBundle\Guesser\Propel2ORMFieldGuesser</parameter>
-        <parameter key="admingenerator.queryfilter.propel2.class">Admingenerator\GeneratorBundle\QueryFilter\PropelQueryFilter</parameter>
+        <parameter key="admingenerator.queryfilter.propel2.class">Admingenerator\GeneratorBundle\QueryFilter\Propel2QueryFilter</parameter>
     </parameters>
 
     <services>