diff --git a/apachesolr_views.module b/apachesolr_views.module
index 743f507..e3a2d9e 100644
--- a/apachesolr_views.module
+++ b/apachesolr_views.module
@@ -19,9 +19,9 @@ function apachesolr_views_views_api() {
  */
 function apachesolr_views_apachesolr_entities() {
   return array(
-    'node' => array(
-      'name' => 'Node',
-      'base_field' => 'nid',
+    'entity' => array(
+      'name' => 'Entity',
+      'base_field' => 'entity_id',
     ),
   );
 }
@@ -257,4 +257,4 @@ function apachesolr_views_field_names_fieldapi($apachesolr_field_name) {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/apachesolr_views_query.inc b/apachesolr_views_query.inc
index 27d0541..91f4811 100644
--- a/apachesolr_views_query.inc
+++ b/apachesolr_views_query.inc
@@ -100,7 +100,9 @@ class apachesolr_views_query extends views_plugin_query {
       }
 
       apachesolr_search_add_boost_params($query);
-      list($final_query, $response) = apachesolr_do_query($query, $this->pager->current_page);
+
+      $query->page = $this->pager->current_page;
+      list($final_query, $response) = apachesolr_do_query($query);
       apachesolr_has_searched(TRUE);
 
       // This is needed for removing errors in standard field handler.
diff --git a/handlers/apachesolr_views_handler_field.inc b/handlers/apachesolr_views_handler_field.inc
index 247bca1..295b211 100644
--- a/handlers/apachesolr_views_handler_field.inc
+++ b/handlers/apachesolr_views_handler_field.inc
@@ -4,9 +4,9 @@ class apachesolr_views_handler_field extends views_handler_field {
 
   function get_value($values, $field = NULL) {
     $alias = isset($field) ? $this->aliases[$field] : $this->field_alias;
-    if (isset($values->node->{$alias})) {
-      return $values->node->{$alias};
+    if (isset($values->fields[$alias])) {
+      return $values->fields[$alias];
     }
   }
 
-}
\ No newline at end of file
+}