diff --git a/app/controllers/vm_common.rb b/app/controllers/vm_common.rb
index 3a43ed8bcc5c..436c77c889df 100644
--- a/app/controllers/vm_common.rb
+++ b/app/controllers/vm_common.rb
@@ -1193,7 +1193,6 @@ def replace_right_cell(options = {})
         locals[:submit_button]   = @sb[:action] != 'miq_request_new' # need submit button on the screen
         locals[:continue_button] = @sb[:action] == 'miq_request_new' # need continue button on the screen
         update_buttons(locals) if @edit && @edit[:buttons].present?
-        presenter[:clear_tree_cookies] = "all_tags_tree"
       end
 
       if ['snapshot_add'].include?(@sb[:action])
diff --git a/app/javascript/components/taggingWrapper.jsx b/app/javascript/components/taggingWrapper.jsx
index 0feabb9fbfc7..df2ba7269c46 100644
--- a/app/javascript/components/taggingWrapper.jsx
+++ b/app/javascript/components/taggingWrapper.jsx
@@ -88,18 +88,18 @@ TaggingWrapper.propTypes = {
   }),
   tags: PropTypes.shape({
     tags: PropTypes.arrayOf(PropTypes.shape({
-      id: PropTypes.oneOfType(PropTypes.string, PropTypes.number).isRequired,
+      id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
       description: PropTypes.string.isRequired,
       values: PropTypes.arrayOf(PropTypes.shape({
-        id: PropTypes.oneOfType(PropTypes.string, PropTypes.number).isRequired,
+        id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
         description: PropTypes.string.isRequired,
       }).isRequired).isRequired,
     })).isRequired,
     assignedTags: PropTypes.arrayOf(PropTypes.shape({
-      id: PropTypes.oneOfType(PropTypes.string, PropTypes.number).isRequired,
+      id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
       description: PropTypes.string.isRequired,
       values: PropTypes.arrayOf(PropTypes.shape({
-        id: PropTypes.oneOfType(PropTypes.string, PropTypes.number).isRequired,
+        id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
         description: PropTypes.string.isRequired,
       }).isRequired).isRequired,
     })).isRequired,
diff --git a/app/views/miq_request/_prov_edit.html.haml b/app/views/miq_request/_prov_edit.html.haml
index d16c81014e3d..d4d53c63b86f 100644
--- a/app/views/miq_request/_prov_edit.html.haml
+++ b/app/views/miq_request/_prov_edit.html.haml
@@ -4,5 +4,3 @@
 - unless @edit[:explorer]
   = render :partial => 'miq_request/prov_form_buttons'
   = _("Note: Fields marked with * are required.")
-:javascript
-  miqDeleteTreeCookies('all_tags_tree')
diff --git a/app/views/miq_request/_prov_field.html.haml b/app/views/miq_request/_prov_field.html.haml
index 532dbcb4d7bb..55c687f9e08f 100644
--- a/app/views/miq_request/_prov_field.html.haml
+++ b/app/views/miq_request/_prov_field.html.haml
@@ -290,13 +290,6 @@
       - elsif [:tag_ids, :vm_tags].include?(field)
         -# tree control for tags fields
         .col-md-10
-          #all_tags_treebox.treeview-pf-hover.treeview-pf-select{:style => "color:#000; overflow: hidden;"}
-          - if @edit && @edit[:req_id]
-            - check = @edit[:req_id]
-          - elsif @miq_request
-            - check = @miq_request.id
-          - else
-            - check = 'new'
           = react('TaggingWrapperConnected',
             :tags    => @tags,
             :options => { :type => 'provision', :hideHeaders => true, :hideButtons => true, :url => url_for_only_path(:action => 'prov_field_changed')})