diff --git a/lib/rapi/connector.py b/lib/rapi/connector.py
index b6c66f66f4d3c820f8fb6ed8b3610ee4893be84d..ed82fca67c05c23cd84ce556ca16453f85b0d2cc 100644
--- a/lib/rapi/connector.py
+++ b/lib/rapi/connector.py
@@ -150,7 +150,8 @@ class R_2(baserlib.R_Generic):
 
 
 def GetHandlers(node_name_pattern, instance_name_pattern,
-                group_name_pattern, job_id_pattern, disk_pattern):
+                group_name_pattern, job_id_pattern, disk_pattern,
+                query_res_pattern):
   """Returns all supported resources and their handlers.
 
   """
@@ -246,4 +247,5 @@ def GetHandlers(node_name_pattern, instance_name_pattern,
 
 
 CONNECTOR.update(GetHandlers(_NAME_PATTERN, _NAME_PATTERN, _NAME_PATTERN,
-                             constants.JOB_ID_TEMPLATE, _DISK_PATTERN))
+                             constants.JOB_ID_TEMPLATE, _DISK_PATTERN,
+                             _NAME_PATTERN))
diff --git a/test/docs_unittest.py b/test/docs_unittest.py
index 1926682c6916629b96be6f1e17b9cd17695165b1..6959616e69fc48e2dfa7bacd869358c195a55e0f 100755
--- a/test/docs_unittest.py
+++ b/test/docs_unittest.py
@@ -95,9 +95,10 @@ class TestDocs(unittest.TestCase):
     group_name = re.escape("[group_name]")
     job_id = re.escape("[job_id]")
     disk_index = re.escape("[disk_index]")
+    query_res = re.escape("[resource]")
 
     resources = connector.GetHandlers(node_name, instance_name, group_name,
-                                      job_id, disk_index)
+                                      job_id, disk_index, query_res)
 
     handler_dups = utils.FindDuplicates(resources.values())
     self.assertFalse(handler_dups,
@@ -110,6 +111,7 @@ class TestDocs(unittest.TestCase):
       re.compile(group_name): "group4440",
       re.compile(job_id): "9409",
       re.compile(disk_index): "123",
+      re.compile(query_res): "lock",
       }
 
     assert compat.all(VALID_URI_RE.match(value)