diff --git a/exposed_filter_data.module b/exposed_filter_data.module
index d79695f..31e4961 100644
--- a/exposed_filter_data.module
+++ b/exposed_filter_data.module
@@ -26,12 +26,11 @@ function exposed_filter_data_preprocess_exposed_filter_data(&$vars) {
   // Add the CSS
   drupal_add_css(drupal_get_path('module', 'exposed_filter_data') .'/exposed_filter_data.css');
 
-  $view = $vars['view'];
-
   // In case no view - get the current view
-  if ($view == NULL) {
-    $view = views_get_current_view();
+  if ($vars['view'] == NULL) {
+    $vars['view'] = views_get_current_view();
   }
+  $view = $vars['view'];
 
   // Make a variable out of each filter
   if (isset($view->exposed_input)) {
@@ -46,6 +45,6 @@ function exposed_filter_data_preprocess_exposed_filter_data(&$vars) {
  * Simple call to the theme, easy to be used in a view header
  *
  */
-function get_exposed_filter_output() {
-  return theme('exposed_filter_data');
+function get_exposed_filter_output($view = null) {
+  return theme('exposed_filter_data', $view);
 }
\ No newline at end of file