diff --git a/querydsl-collections/pom.xml b/querydsl-collections/pom.xml
index 905d7b0f3..e6cb88219 100644
--- a/querydsl-collections/pom.xml
+++ b/querydsl-collections/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>0.3.6-SNAPSHOT</version>
+    <version>0.3.7-SNAPSHOT</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/JavaOps.java b/querydsl-collections/src/main/java/com/mysema/query/collections/JavaOps.java
index ee45ff394..8ddf784b6 100644
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/JavaOps.java
+++ b/querydsl-collections/src/main/java/com/mysema/query/collections/JavaOps.java
@@ -11,7 +11,6 @@ import java.util.regex.Pattern;
 import com.mysema.query.serialization.OperationPatterns;
 import com.mysema.query.types.operation.Ops;
 import com.mysema.query.types.operation.Ops.Op;
-import com.mysema.query.types.operation.Ops.OpMath;
 import com.mysema.query.types.path.PathMetadata;
 import com.mysema.query.types.path.PathMetadata.PathType;
 
@@ -60,7 +59,7 @@ public class JavaOps extends OperationPatterns {
         add(Ops.STRING_LENGTH, "%s.length(%s)");
         add(Ops.LAST_INDEX_2ARGS, "%s.lastIndex(%s)");
         add(Ops.LAST_INDEX, "%s.lastIndex(%s,%s)");
-        add(Ops.ISEMPTY, "%s.isEmpty()");
+        add(Ops.STRING_ISEMPTY, "%s.isEmpty()");
         add(Ops.STARTSWITH, "%s.startsWith(%s, 0)");
         add(Ops.STARTSWITH_IC, "%s.toLowerCase().startsWith(%s.toLowerCase(), 0)");
         add(Ops.INDEXOF_2ARGS, "%s.indexOf(%s,%s)");
@@ -69,6 +68,8 @@ public class JavaOps extends OperationPatterns {
         add(Ops.ENDSWITH, "%s.endsWith(%s)");
         add(Ops.ENDSWITH_IC, "%s.toLowerCase().endsWith(%s.toLowerCase())");
         add(Ops.CONTAINS, "%s.contains(%s)");
+        add(Ops.COL_ISEMPTY, "%s.isEmpty()");
+        add(Ops.COL_ISNOTEMPTY, "!%s.isEmpty()");
         
         // math        
         try {
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/ColQueryTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/ColQueryTest.java
index a909c67c5..4692fd6b9 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/ColQueryTest.java
+++ b/querydsl-collections/src/test/java/com/mysema/query/collections/ColQueryTest.java
@@ -32,7 +32,7 @@ public class ColQueryTest extends AbstractQueryTest{
     @Test
     public void isTypeOf(){
         assertEquals(Arrays.asList(c1, c2),
-            query().from(cat, c1, c2).where(Grammar.typeOf(cat, Cat.class)).list(cat));
+            query().from(cat, c1, c2).where(Grammar.instanceOf(cat, Cat.class)).list(cat));
     }   
     
     @Test
@@ -114,6 +114,10 @@ public class ColQueryTest extends AbstractQueryTest{
         query().from(cat,cats).list(cat.mate);
         
         query().from(cat,cats).list(cat.kittens);
+     
+        query().from(cat,cats).where(cat.kittens.empty()).list(cat);
+        
+        query().from(cat,cats).where(cat.kittens.notEmpty()).list(cat);
         
         query().from(cat,cats).where(cat.name.like("fri%")).list($(cat.name));