=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/EqOp.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/EqOp.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/EqOp.java	2015-06-19 07:13:05 +0000
@@ -41,7 +41,7 @@
     {
         if ( getValue() == null || object == null )
         {
-            return OpStatus.IGNORE;
+            return OpStatus.EXCLUDE;
         }
 
         if ( String.class.isInstance( object ) )
@@ -101,6 +101,6 @@
             return (s1 != null && s2.equals( s1 )) ? OpStatus.INCLUDE : OpStatus.EXCLUDE;
         }
 
-        return OpStatus.IGNORE;
+        return OpStatus.EXCLUDE;
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/GteOp.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/GteOp.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/GteOp.java	2015-06-19 07:13:05 +0000
@@ -41,7 +41,7 @@
     {
         if ( getValue() == null || object == null )
         {
-            return OpStatus.IGNORE;
+            return OpStatus.EXCLUDE;
         }
 
         if ( Integer.class.isInstance( object ) )

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/LikeOp.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/LikeOp.java	2015-01-20 07:04:36 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/LikeOp.java	2015-06-19 07:13:05 +0000
@@ -38,7 +38,7 @@
     {
         if ( getValue() == null || object == null )
         {
-            return OpStatus.IGNORE;
+            return OpStatus.EXCLUDE;
         }
 
         if ( String.class.isInstance( object ) )
@@ -49,6 +49,6 @@
             return (s1 != null && s2.toLowerCase().contains( s1.toLowerCase() )) ? OpStatus.INCLUDE : OpStatus.EXCLUDE;
         }
 
-        return OpStatus.IGNORE;
+        return OpStatus.EXCLUDE;
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/LtOp.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/LtOp.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/LtOp.java	2015-06-19 07:13:05 +0000
@@ -41,7 +41,7 @@
     {
         if ( getValue() == null || object == null )
         {
-            return OpStatus.IGNORE;
+            return OpStatus.EXCLUDE;
         }
 
         if ( Integer.class.isInstance( object ) )
@@ -80,6 +80,6 @@
             return (s1 != null && (s2.before( s1 ))) ? OpStatus.INCLUDE : OpStatus.EXCLUDE;
         }
 
-        return OpStatus.IGNORE;
+        return OpStatus.EXCLUDE;
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/LteOp.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/LteOp.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/LteOp.java	2015-06-19 07:13:05 +0000
@@ -41,7 +41,7 @@
     {
         if ( getValue() == null || object == null )
         {
-            return OpStatus.IGNORE;
+            return OpStatus.EXCLUDE;
         }
 
         if ( Integer.class.isInstance( object ) )
@@ -80,6 +80,6 @@
             return (s1 != null && (s2.before( s1 ) || s2.equals( s1 ))) ? OpStatus.INCLUDE : OpStatus.EXCLUDE;
         }
 
-        return OpStatus.IGNORE;
+        return OpStatus.EXCLUDE;
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/NLikeOp.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/NLikeOp.java	2015-01-20 07:15:07 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/NLikeOp.java	2015-06-19 07:13:05 +0000
@@ -38,7 +38,7 @@
     {
         if ( getValue() == null || object == null )
         {
-            return OpStatus.IGNORE;
+            return OpStatus.EXCLUDE;
         }
 
         if ( String.class.isInstance( object ) )
@@ -49,6 +49,6 @@
             return (s1 != null && s2.toLowerCase().contains( s1.toLowerCase() )) ? OpStatus.EXCLUDE : OpStatus.INCLUDE;
         }
 
-        return OpStatus.IGNORE;
+        return OpStatus.EXCLUDE;
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/NnullOp.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/NnullOp.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/NnullOp.java	2015-06-19 07:13:05 +0000
@@ -47,6 +47,6 @@
             return OpStatus.INCLUDE;
         }
 
-        return OpStatus.IGNORE;
+        return OpStatus.EXCLUDE;
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/NullOp.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/NullOp.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/NullOp.java	2015-06-19 07:13:05 +0000
@@ -47,6 +47,6 @@
             return OpStatus.INCLUDE;
         }
 
-        return OpStatus.IGNORE;
+        return OpStatus.EXCLUDE;
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/StartsWithOp.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/StartsWithOp.java	2015-01-20 07:04:36 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/StartsWithOp.java	2015-06-19 07:13:05 +0000
@@ -38,7 +38,7 @@
     {
         if ( getValue() == null || object == null )
         {
-            return OpStatus.IGNORE;
+            return OpStatus.EXCLUDE;
         }
 
         if ( String.class.isInstance( object ) )
@@ -49,6 +49,6 @@
             return (s1 != null && s2.toLowerCase().startsWith( s1.toLowerCase() )) ? OpStatus.INCLUDE : OpStatus.EXCLUDE;
         }
 
-        return OpStatus.IGNORE;
+        return OpStatus.EXCLUDE;
     }
 }