diff --git a/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardAdvancedOptionsStep/components/PlanWizardAdvancedOptionsStepTable/PlanWizardAdvancedOptionsStepTable.js b/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardAdvancedOptionsStep/components/PlanWizardAdvancedOptionsStepTable/PlanWizardAdvancedOptionsStepTable.js
index 2de0873324..ebc6cdaa6b 100644
--- a/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardAdvancedOptionsStep/components/PlanWizardAdvancedOptionsStepTable/PlanWizardAdvancedOptionsStepTable.js
+++ b/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardAdvancedOptionsStep/components/PlanWizardAdvancedOptionsStepTable/PlanWizardAdvancedOptionsStepTable.js
@@ -15,9 +15,9 @@ import {
   PAGINATION_VIEW
 } from 'patternfly-react';
 
-import rowFilter from './rowFilter';
-import searchFilter from './searchFilter';
-import CustomToolbarFind from './CustomToolbarFind';
+import rowFilter from '../../../common/rowFilter';
+import searchFilter from '../../../common/searchFilter';
+import CustomToolbarFind from '../../../common/CustomToolbarFind';
 import vmSelectionHeaderCellFormatter from './vmSelectionHeaderCellFormatter';
 import vmSelectionCellFormatter from './vmSelectionCellFormatter';
 
@@ -499,7 +499,6 @@ class PlanWizardAdvancedOptionsStepTable extends React.Component {
                       onRemove={this.removeFilter}
                       filterData={item}
                     >
-                      {__('label=')}
                       {item.label}
                     </Filter.Item>
                   ))}
diff --git a/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardVMStep/components/PlanWizardVMStepTable.js b/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardVMStep/components/PlanWizardVMStepTable.js
index 28c33f8785..02deb02b51 100644
--- a/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardVMStep/components/PlanWizardVMStepTable.js
+++ b/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardVMStep/components/PlanWizardVMStepTable.js
@@ -21,9 +21,9 @@ import {
   PAGINATION_VIEW
 } from 'patternfly-react';
 
-import rowFilter from './rowFilter';
-import searchFilter from './searchFilter';
-import CustomToolbarFind from './CustomToolbarFind';
+import rowFilter from '../../common/rowFilter';
+import searchFilter from '../../common/searchFilter';
+import CustomToolbarFind from '../../common/CustomToolbarFind';
 import vmSelectionHeaderCellFormatter from './vmSelectionHeaderCellFormatter';
 import vmSelectionCellFormatter from './vmSelectionCellFormatter';
 
diff --git a/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardAdvancedOptionsStep/components/PlanWizardAdvancedOptionsStepTable/CustomToolbarFind.js b/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/common/CustomToolbarFind.js
similarity index 100%
rename from app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardAdvancedOptionsStep/components/PlanWizardAdvancedOptionsStepTable/CustomToolbarFind.js
rename to app/javascript/react/screens/App/Overview/screens/PlanWizard/components/common/CustomToolbarFind.js
diff --git a/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardAdvancedOptionsStep/components/PlanWizardAdvancedOptionsStepTable/rowFilter.js b/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/common/rowFilter.js
similarity index 100%
rename from app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardAdvancedOptionsStep/components/PlanWizardAdvancedOptionsStepTable/rowFilter.js
rename to app/javascript/react/screens/App/Overview/screens/PlanWizard/components/common/rowFilter.js
diff --git a/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardAdvancedOptionsStep/components/PlanWizardAdvancedOptionsStepTable/searchFilter.js b/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/common/searchFilter.js
similarity index 100%
rename from app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardAdvancedOptionsStep/components/PlanWizardAdvancedOptionsStepTable/searchFilter.js
rename to app/javascript/react/screens/App/Overview/screens/PlanWizard/components/common/searchFilter.js