diff --git a/plugins/export_ui/views_ui.class.php b/plugins/export_ui/views_ui.class.php
index 73542c9..cb888ac 100644
--- a/plugins/export_ui/views_ui.class.php
+++ b/plugins/export_ui/views_ui.class.php
@@ -128,10 +128,13 @@ class views_ui extends ctools_export_ui {
     );
 
     $tags = array();
-    if (isset($form_state['views'])) {
-      foreach ($form_state['views'] as $name => $view) {
+    if (isset($form_state['object']->items)) {
+      foreach ($form_state['object']->items as $name => $view) {
         if (!empty($view->tag)) {
-          $tags[$view->tag] = $view->tag;
+          $view_tags = drupal_explode_tags($view->tag);
+          foreach ($view_tags as $tag) {
+            $tags[$tag] = $tag;
+          }
         }
       }
     }
@@ -162,6 +165,17 @@ class views_ui extends ctools_export_ui {
   }
 
   function list_filter($form_state, $view) {
+    // Don't filter by tags if all is set up.
+    if ($form_state['values']['tag'] != 'all') {
+      // If none is selected check whether the view has a tag.
+      if ($form_state['values']['tag'] == 'none') {
+        return !empty($view->tag);
+      }
+      else {
+        // Check whether the tag can be found in the views tag.
+        return strpos($view->tag, $form_state['values']['tag']) === FALSE;
+      }
+    }
     if ($form_state['values']['base'] != 'all' && $form_state['values']['base'] != $view->base_table) {
       return TRUE;
     }
diff --git a/theme/theme.inc b/theme/theme.inc
index e4ee9b4..a4b1a72 100644
--- a/theme/theme.inc
+++ b/theme/theme.inc
@@ -24,6 +24,12 @@ function _views_theme_functions($hook, $view, $display = NULL) {
     $themes[] = $hook . '__' . $view->name . '__' . $display->id;
     $themes[] = $hook . '__' . $display->id;
     $themes[] = $hook . '__' . preg_replace('/[^a-z0-9]/', '_', strtolower($view->tag));
+
+    // Add theme suggestions foreach single tag.
+    foreach (drupal_explode_tags($view->tag) as $tag) {
+      $themes[] = $hook . '__' . preg_replace('/[^a-z0-9]/', '_', strtolower($tag));
+    }
+
     if ($display->id != $display->display_plugin) {
       $themes[] = $hook . '__' . $view->name . '__' . $display->display_plugin;
       $themes[] = $hook . '__' . $display->display_plugin;