diff --git a/webform_views_submitted.views.inc b/webform_views_submitted.views.inc
index 2543982..4f7e0cb 100644
--- a/webform_views_submitted.views.inc
+++ b/webform_views_submitted.views.inc
@@ -57,11 +57,13 @@ function webform_views_submitted_views_data() {
         'handler' => 'webform_views_submitted_handler_field',
         'click sortable' => TRUE,
         'webform component' => $component['cid'],
+        'webform node' => $component['nid'],
       ),
       'filter' => array(
         'title' => t($component['name']) . ' (' . $component['form_key'] . ')',
         'handler' => ($component['type'] == 'select') ? 'webform_views_submitted_handler_filter_many_to_one' : 'views_handler_filter_string',
         'webform component' => $component['cid'],
+        'webform node' => $component['nid'],
       ),
       'sort' => array(
         'handler' => 'views_handler_sort',
@@ -69,4 +71,4 @@ function webform_views_submitted_views_data() {
     );
   }
   return $data;
-}
\ No newline at end of file
+}
diff --git a/webform_views_submitted_handler_field.inc b/webform_views_submitted_handler_field.inc
index 7b04218..d28bece 100644
--- a/webform_views_submitted_handler_field.inc
+++ b/webform_views_submitted_handler_field.inc
@@ -7,7 +7,7 @@ class webform_views_submitted_handler_field extends views_handler_field {
 	function construct() {
 	  parent::construct();
     module_load_include('inc', 'webform', 'components/select');
-	  $this->webform_component = db_fetch_array(db_query("SELECT * FROM {webform_component} WHERE cid = %d", $this->definition['webform component']));
+	  $this->webform_component = db_fetch_array(db_query("SELECT * FROM {webform_component} WHERE cid = %d and nid = %d", $this->definition['webform component'], $this->definition['webform node']));
     $this->webform_component['extra'] = unserialize($this->webform_component['extra']);
     $this->webform_component['options'] = _webform_select_options($this->webform_component, FALSE, FALSE);
     $this->webform_component['custom_options'] = _webform_select_options_from_text($this->options['expose']['webform_component_custom_options']);
diff --git a/webform_views_submitted_handler_filter_many_to_one.inc b/webform_views_submitted_handler_filter_many_to_one.inc
index 15c8749..e1aca84 100644
--- a/webform_views_submitted_handler_filter_many_to_one.inc
+++ b/webform_views_submitted_handler_filter_many_to_one.inc
@@ -7,7 +7,7 @@ class webform_views_submitted_handler_filter_many_to_one extends views_handler_f
 	function construct() {
 		parent::construct();
     module_load_include('inc', 'webform', 'components/select');
-		$this->webform_component = db_fetch_array(db_query("SELECT * FROM {webform_component} WHERE cid = %d", $this->definition['webform component']));
+		$this->webform_component = db_fetch_array(db_query("SELECT * FROM {webform_component} WHERE cid = %d and nid = %d", $this->definition['webform component']));
 		$this->webform_component['extra'] = unserialize($this->webform_component['extra']);
     $this->webform_component['options'] = _webform_select_options($this->webform_component, FALSE, FALSE);
 	}