diff --git a/includes/entity.inc b/includes/entity.inc
index ae78077..0ac50e9 100644
--- a/includes/entity.inc
+++ b/includes/entity.inc
@@ -255,7 +255,8 @@ class DrupalDefaultEntityController implements DrupalEntityControllerInterface {
     $query->addTag($this->entityType . '_load_multiple');
 
     if ($revision_id) {
-      $query->join($this->revisionTable, 'revision', "revision.{$this->idKey} = base.{$this->idKey} AND revision.{$this->revisionKey} = :revisionId", array(':revisionId' => $revision_id));
+      $query->join($this->revisionTable, 'revision', "revision.{$this->idKey} = base.{$this->idKey}");
+      $query->condition("revision.{$this->revisionKey}", $revision_id);
     }
     elseif ($this->revisionKey) {
       $query->join($this->revisionTable, 'revision', "revision.{$this->revisionKey} = base.{$this->revisionKey}");
diff --git a/modules/node/node.module b/modules/node/node.module
index 71ea3b9..089557e 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -2578,10 +2578,10 @@ function node_view_multiple($nodes, $view_mode = 'teaser', $weight = 0, $langcod
 function node_page_default() {
   $select = db_select('node', 'n')
     ->fields('n', array('nid', 'sticky', 'created'))
-    ->condition('promote', 1)
-    ->condition('status', 1)
-    ->orderBy('sticky', 'DESC')
-    ->orderBy('created', 'DESC')
+    ->condition('n.promote', 1)
+    ->condition('n.status', 1)
+    ->orderBy('n.sticky', 'DESC')
+    ->orderBy('n.created', 'DESC')
     ->extend('PagerDefault')
     ->limit(variable_get('default_nodes_main', 10))
     ->addTag('node_access');