diff --git a/query-language.txt b/query-language.txt
index 21bf1b41b..97d7fd079 100644
--- a/query-language.txt
+++ b/query-language.txt
@@ -168,19 +168,17 @@ ConditionalExpression       ::= ConditionalTerm {"OR" ConditionalTerm}*
 ConditionalTerm             ::= ConditionalFactor {"AND" ConditionalFactor}*
 ConditionalFactor           ::= ["NOT"] ConditionalPrimary
 ConditionalPrimary          ::= SimpleConditionalExpression | "(" ConditionalExpression ")"
-SimpleConditionalExpression ::= ExistsExpression |
-                                (SimpleStateFieldPathExpression (ComparisonExpression | BetweenExpression | LikeExpression |
-                                InExpression | NullComparisonExpression)) |
-                                (CollectionValuedPathExpression EmptyCollectionComparisonExpression) |
-                                (EntityExpression CollectionMemberExpression)
+SimpleConditionalExpression ::= ComparisonExpression | BetweenExpression | LikeExpression |
+                                InExpression | NullComparisonExpression | ExistsExpression |
+                                EmptyCollectionComparisonExpression | CollectionMemberExpression
 /* EmptyCollectionComparisonExpression and CollectionMemberExpression are for the future */
 
 
 /*
  * COLLECTION EXPRESSIONS (FOR THE FUTURE)
  */
-EmptyCollectionComparisonExpression ::= "IS" ["NOT"] "EMPTY"
-CollectionMemberExpression          ::= ["NOT"] "MEMBER" ["OF"] CollectionValuedPathExpression
+EmptyCollectionComparisonExpression ::= CollectionValuedPathExpression "IS" ["NOT"] "EMPTY"
+CollectionMemberExpression          ::= EntityExpression ["NOT"] "MEMBER" ["OF"] CollectionValuedPathExpression
 
 
 /*
diff --git a/tests/Orm/Query/SelectSqlGenerationTest.php b/tests/Orm/Query/SelectSqlGenerationTest.php
index 0f81ac658..55b0f3a79 100755
--- a/tests/Orm/Query/SelectSqlGenerationTest.php
+++ b/tests/Orm/Query/SelectSqlGenerationTest.php
@@ -109,14 +109,14 @@ class Orm_Query_SelectSqlGenerationTest extends Doctrine_OrmTestCase
         );
     }
 
- /*   public function testWhereClauseInSelect()
+    public function testWhereClauseInSelect()
     {
         $this->assertSqlGeneration(
             'select u from ForumUser u where u.id = ?',
             'SELECT fu.id AS fu__id, fu.username AS fu__username FROM ForumUser fu WHERE fu.id = ?'
         );
     }
-*/
+
 /*    public function testAggregateFunctionWithDistinctInSelect()
     {
         $this->assertSqlGeneration(