diff --git a/src/PHPCR/Util/QOM/Sql2Scanner.php b/src/PHPCR/Util/QOM/Sql2Scanner.php
index 46966df..9afafe8 100644
--- a/src/PHPCR/Util/QOM/Sql2Scanner.php
+++ b/src/PHPCR/Util/QOM/Sql2Scanner.php
@@ -184,7 +184,7 @@ protected function tokenize(&$tokens, $token)
         $buffer = '';
         for ($i = 0; $i < strlen($token); $i++) {
             $char = trim(substr($token, $i, 1));
-            if (in_array($char, array('[', ']', '.', ',', '(', ')', '='))) {
+            if (in_array($char, array('.', ',', '(', ')', '='))) {
                 if ($buffer !== '') {
                     $tokens[] = $buffer;
                     $buffer = '';
diff --git a/src/PHPCR/Util/QOM/Sql2ToQomQueryConverter.php b/src/PHPCR/Util/QOM/Sql2ToQomQueryConverter.php
index 16e63dd..12311b5 100644
--- a/src/PHPCR/Util/QOM/Sql2ToQomQueryConverter.php
+++ b/src/PHPCR/Util/QOM/Sql2ToQomQueryConverter.php
@@ -789,10 +789,6 @@ protected function parseLiteralValue()
             return $this->parseCastLiteral($token);
         }
 
-        if ($this->scanner->tokenIs($token, 'NULL')) {
-            return null;
-        }
-
         $quoteString = false;
         if (substr($token, 0, 1) === '\'') {
             $quoteString = "'";
@@ -939,9 +935,9 @@ private function fetchTokenWithoutBrackets()
     {
         $token = $this->scanner->fetchNextToken();
 
-        if ($token === '[') {
-            $token = $this->scanner->fetchNextToken();
-            $this->scanner->expectToken(']');
+        if (substr($token, 0, 1) === '[' && substr($token, -1) === ']') {
+            // Remove brackets around the selector name
+            $token = substr($token, 1, -1);
         }
 
         return $token;