diff --git a/resources/node_resource.inc b/resources/node_resource.inc
index 46ef024..d6c2a86 100644
--- a/resources/node_resource.inc
+++ b/resources/node_resource.inc
@@ -290,7 +290,7 @@ function _node_resource_delete($nid) {
  * @param $fields
  *   The fields you want returned.
  * @param $parameters
- *   An array of fields and values used to build a sql WHERE clause indicating
+ *   An object containing fields and values used to build a sql WHERE clause indicating
  *   what items should be deleted.
  * @return
  *   An array of node objects.
@@ -301,8 +301,7 @@ function _node_resource_delete($nid) {
  *     - Is there an easier syntax we can define which can make the urls
  *       for index requests more straightforward?
  **/
-function _node_resource_index($page = 0, $fields = '*', $parameters = array()) {
-  $nodes = array();
+function _node_resource_index($page = 0, $fields = '*', $parameters = NULL) {
   $node_select = db_select('node', 'n')
     ->addTag('node_access')
     ->orderBy('sticky', 'DESC')
@@ -319,11 +318,13 @@ function _node_resource_index($page = 0, $fields = '*', $parameters = array()) {
   if (!user_access('administer nodes')) {
     $node_select->condition('status', 1);
   }
-  if(is_array($parameters)) {
+  
+  if (is_object($parameters)) {
     foreach ($parameters as $parameter => $parameter_value) {
       $node_select->condition($parameter, $parameter_value, '=');
     }
   }
+  
   $result = $node_select->execute();
 
   $nodes = array();
diff --git a/resources/user_resource.inc b/resources/user_resource.inc
index 6fc2272..dccc229 100644
--- a/resources/user_resource.inc
+++ b/resources/user_resource.inc
@@ -379,7 +379,7 @@ function _user_resource_logout() {
 }
 
 /**
- * Return an array of optionally paged nids baed on a set of criteria.
+ * Return an array of optionally paged uids baed on a set of criteria.
  *
  * An example request might look like
  *
@@ -393,14 +393,14 @@ function _user_resource_logout() {
  * @param $fields
  *   The fields you want returned. 
  * @param $parameters
- *   An array of fields and values used to build a sql WHERE clause indicating
+ *   An object containing fields and values used to build a sql WHERE clause indicating
  *   what items should be deleted.
  * @return
  *   An array of user objects.
  *
  * @see _node_resource_index() for more notes
  **/
-function _user_resource_index($page = 0, $fields = '*', $parameters = array()) {
+function _user_resource_index($page = 0, $fields = '*', $parameters = NULL) {
   $user_select = db_select('users', 'u');
   if($fields == '*') { 
     $user_select->fields('u');  
@@ -410,7 +410,16 @@ function _user_resource_index($page = 0, $fields = '*', $parameters = array()) {
   }
   $user_select->orderBy('created', 'DESC');
   $user_select->range($page * 20, 20);
+  
+  if (is_object($parameters)) {
+    foreach ($parameters as $parameter => $parameter_value) {
+      $user_select->condition($parameter, $parameter_value, '=');
+    }
+  }
+  
   $result = $user_select->execute();
+  
+  $users = array();
   foreach($result as $user) {  
     if ($uri = services_resource_uri(array('user', $user->uid))) {
       $user->uri = $uri;
diff --git a/servers/rest_server/includes/RESTServer.inc b/servers/rest_server/includes/RESTServer.inc
old mode 100755
new mode 100644
diff --git a/servers/rest_server/rest_server.module b/servers/rest_server/rest_server.module
old mode 100755
new mode 100644