diff --git a/arangod/Aql/Ast.cpp b/arangod/Aql/Ast.cpp
index def4f90686..82e15374c5 100644
--- a/arangod/Aql/Ast.cpp
+++ b/arangod/Aql/Ast.cpp
@@ -1094,7 +1094,15 @@ AstNode* Ast::optimizeBinaryOperatorLogical (AstNode* node) {
     return node;
   }
 
-  if (! lhsIsConst || ! rhsIsConst) {
+  if (! lhsIsConst) {
+    if (node->type == NODE_TYPE_OPERATOR_BINARY_OR) {
+      if (rhsIsConst && ! rhs->getBoolValue()) {
+        // (lhs || false) => lhs
+        return lhs;
+      }
+    }
+
+    // default: don't optimize
     return node;
   }
 
diff --git a/js/server/tests/aql-optimizer-rule-move-filters-up.js b/js/server/tests/aql-optimizer-rule-move-filters-up.js
new file mode 100644
index 0000000000..a9468cec75
--- /dev/null
+++ b/js/server/tests/aql-optimizer-rule-move-filters-up.js
@@ -0,0 +1,182 @@
+/*jslint indent: 2, nomen: true, maxlen: 200, sloppy: true, vars: true, white: true, plusplus: true */
+/*global require, exports, assertTrue, assertEqual, AQL_EXECUTE, AQL_EXPLAIN, fail, loopmax */
+////////////////////////////////////////////////////////////////////////////////
+/// @brief tests for optimizer rules
+///
+/// @file
+///
+/// DISCLAIMER
+///
+/// Copyright 2010-2012 triagens GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is triAGENS GmbH, Cologne, Germany
+///
+/// @author Jan Steemann
+/// @author Copyright 2012, triAGENS GmbH, Cologne, Germany
+////////////////////////////////////////////////////////////////////////////////
+
+var jsunity = require("jsunity");
+var errors = require("internal").errors;
+var helper = require("org/arangodb/aql-helper");
+var getQueryResults = helper.getQueryResults2;
+var assertQueryError = helper.assertQueryError2;
+var isEqual = helper.isEqual;
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test suite
+////////////////////////////////////////////////////////////////////////////////
+
+function optimizerRuleTestSuite () {
+  var ruleName = "move-filters-up";
+  // various choices to control the optimizer: 
+  var paramNone     = { optimizer: { rules: [ "-all" ] } };
+  var paramEnabled  = { optimizer: { rules: [ "-all", "+move-calculations-up", "+" + ruleName ] } };
+  var paramDisabled = { optimizer: { rules: [ "+all", "-" + ruleName ] } };
+
+  return {
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief set up
+////////////////////////////////////////////////////////////////////////////////
+
+    setUp : function () {
+    },
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief tear down
+////////////////////////////////////////////////////////////////////////////////
+
+    tearDown : function () {
+    },
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test that rule has no effect when explicitly disabled
+////////////////////////////////////////////////////////////////////////////////
+
+    testRuleDisabled : function () {
+      var queries = [ 
+        "FOR i IN 1..10 SORT i FILTER i == 1 RETURN 1",
+        "FOR i IN 1..10 LET x = (FOR j IN [ i ] RETURN j) FILTER i == 2 RETURN x",
+        "FOR i IN 1..10 FOR j IN 1..10 FILTER i == 1 FILTER j == 2 RETURN i"
+      ];
+
+      queries.forEach(function(query) {
+        var result = AQL_EXPLAIN(query, { }, paramNone);
+        assertEqual([ ], result.plan.rules);
+      });
+    },
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test that rule has no effect
+////////////////////////////////////////////////////////////////////////////////
+
+    testRuleNoEffect : function () {
+      var queries = [ 
+        "FOR i IN 1..10 FILTER i > 1 RETURN i",
+        "LET a = 99 FOR i IN 1..10 FILTER i > a RETURN i",
+        "LET a = 1 FOR i IN 1..10 FILTER a != i RETURN i",
+        "FOR i IN 1..10 LET a = i LET b = i FILTER a == b RETURN i",
+        "FOR i IN 1..10 FOR j IN 1..10 FILTER i > j RETURN i",
+        "FOR i IN 1..10 LET a = 2 * i FILTER a == 1 RETURN i",
+        "FOR i IN 1..10 LIMIT 1 FILTER i == 1 RETURN i"
+      ];
+
+      queries.forEach(function(query) {
+        var result = AQL_EXPLAIN(query, { }, paramEnabled);
+        assertTrue(result.plan.rules.indexOf(ruleName) === -1, query);
+      });
+    },
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test that rule has an effect
+////////////////////////////////////////////////////////////////////////////////
+
+    testRuleHasEffect : function () {
+      var queries = [ 
+        "FOR i IN 1..10 FOR j IN 1..10 FILTER i > 1 RETURN i",
+        "FOR i IN 1..10 LET x = (FOR j IN [i] RETURN j) FILTER i > 1 RETURN i",
+        "FOR i IN 1..10 LET a = 2 * i FILTER i == 1 RETURN a",
+        "FOR i IN 1..10 LET a = 2 * i FILTER i == 1 LIMIT 1 RETURN a"
+      ];
+
+      queries.forEach(function(query) {
+        var result = AQL_EXPLAIN(query, { }, paramEnabled);
+        assertTrue(result.plan.rules.indexOf(ruleName) === 1, query);
+      });
+    },
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test generated plans
+////////////////////////////////////////////////////////////////////////////////
+
+
+    testPlans : function () {
+      var plans = [ 
+        [ "FOR i IN 1..10 FOR j IN 1..10 FILTER i > 1 RETURN i", [ "SingletonNode", "CalculationNode", "CalculationNode", "EnumerateListNode", "CalculationNode", "FilterNode", "EnumerateListNode", "ReturnNode" ] ],
+        [ "FOR i IN 1..10 LET x = (FOR j IN [i] RETURN j) FILTER i > 1 RETURN i", [ "SingletonNode", "CalculationNode", "EnumerateListNode", "CalculationNode", "FilterNode", "SubqueryNode", "CalculationNode", "ReturnNode" ] ],
+        [ "FOR i IN 1..10 LET a = 2 * i FILTER i == 1 RETURN a", [ "SingletonNode", "CalculationNode", "EnumerateListNode", "CalculationNode", "FilterNode", "CalculationNode", "ReturnNode" ] ],
+        [ "FOR i IN 1..10 FOR j IN 1..10 FILTER i == 1 FILTER j == 2 RETURN i", [ "SingletonNode", "CalculationNode", "CalculationNode", "EnumerateListNode", "CalculationNode", "FilterNode", "EnumerateListNode", "CalculationNode", "FilterNode", "ReturnNode" ] ]
+      ];
+
+      plans.forEach(function(plan) {
+        var result = AQL_EXPLAIN(plan[0], { }, paramEnabled);
+        assertTrue(result.plan.rules.indexOf(ruleName) !== -1, plan[0]);
+        assertEqual(plan[1], helper.getCompactPlan(result).map(function(node) { return node.type; }), plan[0]);
+      });
+    },
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test results
+////////////////////////////////////////////////////////////////////////////////
+
+    testResults : function () {
+      var queries = [ 
+        [ "FOR i IN 1..10 FOR j IN 1..10 FILTER i > 9 RETURN j", [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ] ],
+        [ "FOR i IN 1..10 LET x = (FOR j IN [i] RETURN j) FILTER i > 9 RETURN x", [ [ 10 ] ] ],
+        [ "FOR i IN 1..10 LET a = 2 * i FILTER i == 1 RETURN a", [ 2 ] ],
+        [ "FOR i IN 1..10 LET a = i FOR j IN 1..10 LET b = j FILTER a == 1 FILTER b == 2 RETURN [ a, b ]", [ [ 1, 2 ] ] ]
+      ];
+
+      queries.forEach(function(query) {
+        var planDisabled   = AQL_EXPLAIN(query[0], { }, paramDisabled);
+        var planEnabled    = AQL_EXPLAIN(query[0], { }, paramEnabled);
+        var resultDisabled = AQL_EXECUTE(query[0], { }, paramDisabled).json;
+        var resultEnabled  = AQL_EXECUTE(query[0], { }, paramEnabled).json;
+
+        assertTrue(isEqual(resultDisabled, resultEnabled), query[0]);
+
+        assertTrue(planDisabled.plan.rules.indexOf(ruleName) === -1, query[0]);
+        assertTrue(planEnabled.plan.rules.indexOf(ruleName) !== -1, query[0]);
+
+        assertEqual(resultDisabled, query[1]);
+        assertEqual(resultEnabled, query[1]);
+      });
+    }
+
+  };
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief executes the test suite
+////////////////////////////////////////////////////////////////////////////////
+
+jsunity.run(optimizerRuleTestSuite);
+
+return jsunity.done();
+
+// Local Variables:
+// mode: outline-minor
+// outline-regexp: "^\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @}\\)"
+// End:
diff --git a/js/server/tests/aql-optimizer-rule-remove-unnecessary-filters.js b/js/server/tests/aql-optimizer-rule-remove-unnecessary-filters.js
index 3b940fb649..1136f92ee5 100644
--- a/js/server/tests/aql-optimizer-rule-remove-unnecessary-filters.js
+++ b/js/server/tests/aql-optimizer-rule-remove-unnecessary-filters.js
@@ -69,7 +69,9 @@ function optimizerRuleTestSuite () {
     testRuleDisabled : function () {
       var queries = [ 
         "FOR i IN 1..10 FILTER true RETURN 1",
-        "FOR i IN 1..10 FILTER 1 != 7 RETURN 1"
+        "FOR i IN 1..10 FILTER 1 != 7 RETURN 1",
+        "FOR i IN 1..10 FILTER 1 == 1 && 2 == 2 RETURN 1",
+        "FOR i IN 1..10 FILTER 1 != 1 && 2 != 2 RETURN 1"
       ];
 
       queries.forEach(function(query) {
@@ -108,7 +110,9 @@ function optimizerRuleTestSuite () {
         "FOR i IN 1..10 LET a = 1 LET b = 2 FILTER a != b RETURN i",
         "FOR i IN 1..10 FILTER false RETURN i",
         "FOR i IN 1..10 LET a = 1 FILTER a == 9 RETURN i",
-        "FOR i IN 1..10 LET a = 1 FILTER a != 1 RETURN i"
+        "FOR i IN 1..10 LET a = 1 FILTER a != 1 RETURN i",
+        "FOR i IN 1..10 FILTER 1 == 1 && 2 == 2 RETURN 1",
+        "FOR i IN 1..10 FILTER 1 != 1 && 2 != 2 RETURN 1"
       ];
 
       queries.forEach(function(query) {
@@ -153,6 +157,7 @@ function optimizerRuleTestSuite () {
         [ "FOR i IN 1..10 LET a = 1 LET b = 1 FILTER a == b RETURN i", [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ] ],
         [ "FOR i IN 1..10 FILTER false RETURN i", [ ] ],
         [ "FOR i IN 1..10 FILTER 1 == 7 RETURN i", [ ] ],
+        [ "LET a = 1 FOR i IN 1..10 FILTER a == 7 && a == 3 RETURN i", [ ] ],
         [ "FOR i IN 1..10 LET a = 1 FILTER a == 7 RETURN i", [ ] ],
         [ "FOR i IN 1..10 LET a = 1 FILTER a != 1 RETURN i", [ ] ]
       ];