diff --git a/includes/context-task-handler.inc b/includes/context-task-handler.inc
index d5c97fcbe315591e76e4dd1109c6309b0ba3951f..9203ef2749b02f99332c8a21b550a5dc1f93c50b 100644
--- a/includes/context-task-handler.inc
+++ b/includes/context-task-handler.inc
@@ -6,7 +6,7 @@
  * Support for creating 'context' type task handlers.
  *
  * Context task handlers expect the task to provide 0 or more contexts. The
- * task handler should use those contexts as selection criteria, as well as
+ * task handler should use those contexts as selection rules, as well as
  * rendering with them.
  *
  * The functions and forms in this file should be common to every context type
@@ -75,7 +75,7 @@ function ctools_context_handler_render($task, $subtask_id, $contexts, $page = TR
  *   The context objects provided by the task.
  *
  * @return
- *   TRUE if these contexts match the selection criteria. NULL or FALSE
+ *   TRUE if these contexts match the selection rules. NULL or FALSE
  *   otherwise.
  */
 function ctools_context_handler_select($handler, $contexts) {
@@ -205,7 +205,7 @@ function ctools_context_handler_get_task_arguments($task, $subtask_id) {
 }
 
 /**
- * Form to choose context based selection criteria for a task handler.
+ * Form to choose context based selection rules for a task handler.
  *
  * The configuration will be assumed to go simply in $handler->conf and
  * will be keyed by the argument ID.
@@ -228,7 +228,7 @@ function ctools_context_handler_edit_criteria(&$form, &$form_state) {
 }
 
 /**
- * Submit handler for criteria selection
+ * Submit handler for rules selection
  */
 function ctools_context_handler_edit_criteria_submit(&$form, &$form_state) {
   $form_state['handler']->conf['access']['logic'] = $form_state['values']['logic'];
diff --git a/includes/export.inc b/includes/export.inc
index 8c141a9917be1c6dda8246a252c9caba83eadb33..01c6c0c9b2a79f121395cfda4695f460358ac87d 100644
--- a/includes/export.inc
+++ b/includes/export.inc
@@ -88,8 +88,10 @@ function ctools_export_load_object($table, $type = 'all', $args = array()) {
     }
     else if ($type == 'conditions') {
       foreach ($args as $key => $value) {
-        $conditions[] = "$key = " . db_type_placeholder($schema['fields'][$key]['type']);
-        $query_args[] = $value;
+        if (isset($schema['fields'][$key])) {
+          $conditions[] = "$key = " . db_type_placeholder($schema['fields'][$key]['type']);
+          $query_args[] = $value;
+        }
       }
     }
 
diff --git a/plugins/access/node_access.inc b/plugins/access/node_access.inc
index acf9e72014843a1ba281db9fc21676ec22b4d502..5de95c9941243b88d4d39060760eb0b718887030 100644
--- a/plugins/access/node_access.inc
+++ b/plugins/access/node_access.inc
@@ -11,7 +11,7 @@
  */
 function ctools_node_access_ctools_access() {
   $args['node_access'] = array(
-    'title' => t("Node access by node security"),
+    'title' => t("Node: Access status"),
     'description' => t('Control access with built in Drupal node access test.'),
     'callback' => 'ctools_node_access_ctools_access_check',
     'default' => array('type' => 'view'),
diff --git a/plugins/access/node_language.inc b/plugins/access/node_language.inc
index e90ff1aecd406896e921b13fa1797c498da2bf09..f5b6a154675f6dbe874b1d5b879f0b8929402745 100644
--- a/plugins/access/node_language.inc
+++ b/plugins/access/node_language.inc
@@ -12,7 +12,7 @@
 function ctools_node_language_ctools_access() {
   if (module_exists('locale')) {
     $items['node_language'] = array(
-      'title' => t("Node access by language"),
+      'title' => t("Node: Language"),
       'description' => t('Control access by node language.'),
       'callback' => 'ctools_node_language_ctools_access_check',
       'default' => array('language' => array()),
diff --git a/plugins/access/node_type.inc b/plugins/access/node_type.inc
index c88776506fec602d749343ab9a86780f9cb111f3..0447abdc32e6a1a271434153a035e42356e32065 100644
--- a/plugins/access/node_type.inc
+++ b/plugins/access/node_type.inc
@@ -11,7 +11,7 @@
  */
 function ctools_node_type_ctools_access() {
   $args['node_type'] = array(
-    'title' => t("Node access by type"),
+    'title' => t("Node: Type"),
     'description' => t('Control access by node_type.'),
     'callback' => 'ctools_node_type_ctools_access_check',
     'default' => array('type' => array()),
diff --git a/plugins/access/perm.inc b/plugins/access/perm.inc
index 1a271725ed48c254594bea84c598239be8dbe45d..8ecd2960b4e594f7135b3091011dccd2d308dff8 100644
--- a/plugins/access/perm.inc
+++ b/plugins/access/perm.inc
@@ -11,7 +11,7 @@
  */
 function ctools_perm_ctools_access() {
   $args['perm'] = array(
-    'title' => t("Access by user permission string"),
+    'title' => t("User: Permission string"),
     'description' => t('Control access by permission string.'),
     'callback' => 'ctools_perm_ctools_access_check',
     'default' => array('perm' => 'access content'),
diff --git a/plugins/access/role.inc b/plugins/access/role.inc
index 1ac06671dda2a234a7729a9abb53b725dbfe2d39..a689584e679a763b111ba7b0ad81682463e07e3c 100644
--- a/plugins/access/role.inc
+++ b/plugins/access/role.inc
@@ -11,7 +11,7 @@
  */
 function ctools_role_ctools_access() {
   $args['role'] = array(
-    'title' => t("Access by user role"),
+    'title' => t("User: role"),
     'description' => t('Control access by role.'),
     'callback' => 'ctools_role_ctools_access_check',
     'default' => array('rids' => array()),
diff --git a/plugins/access/site_language.inc b/plugins/access/site_language.inc
index 8b91288bbdf8453be5bc086e56a901c91c4487d7..a97c31fcdeedf57d7ea85785a137b384fd862124 100644
--- a/plugins/access/site_language.inc
+++ b/plugins/access/site_language.inc
@@ -12,8 +12,8 @@
 function ctools_site_language_ctools_access() {
   if (module_exists('locale')) {
     $items['site_language'] = array(
-      'title' => t("Access by site language"),
-      'description' => t('Control access by the language the site currently uses.'),
+      'title' => t("User: language"),
+      'description' => t('Control access by the language the user or site currently uses.'),
       'callback' => 'ctools_site_language_ctools_access_check',
       'default' => array('language' => array()),
       'settings form' => 'ctools_site_language_ctools_access_settings',
diff --git a/plugins/access/term_vocabulary.inc b/plugins/access/term_vocabulary.inc
index 949598fc354fb07c6dcbbf27ee0df5dc5444eb1f..1ec4798dc91ae25adea30e65eb2dafa9274905bf 100644
--- a/plugins/access/term_vocabulary.inc
+++ b/plugins/access/term_vocabulary.inc
@@ -11,7 +11,7 @@
  */
 function ctools_term_vocabulary_ctools_access() {
   $args['term_vocabulary'] = array(
-    'title' => t("Term access by vocabulary"),
+    'title' => t("Taxonomy: Vocabulary"),
     'description' => t('Control access by term vocabulary.'),
     'callback' => 'ctools_term_vocabulary_ctools_access_check',
     'default' => array('vids' => array()),