diff --git a/app/controllers/application_controller/policy_support.rb b/app/controllers/application_controller/policy_support.rb
index e7724e07981f..076d18a6e112 100644
--- a/app/controllers/application_controller/policy_support.rb
+++ b/app/controllers/application_controller/policy_support.rb
@@ -85,6 +85,7 @@ def policy_sim(records = [])
                     :url  => "/#{request.parameters["controller"]}/policy_sim?continue=true")
     session[:policies] = {} unless params[:continue]  # Clear current policies, unless continuing previous simulation
     records = session[:tag_items] if records.empty? && session[:tag_items].present?
+    session[:tag_items] = records
     policy_sim_build_screen(records)
 
     if @explorer
@@ -228,7 +229,7 @@ def assigned_filters
   # Build the policy simulation screen
   def policy_sim_build_screen(records = [])
     @edit ||= {}
-    @tagitems = records ? records : session[:tag_db].find(session[:tag_items]) # Get the db records that are being tagged
+    @tagitems = records.presence || session[:tag_items] # Get the db records that are being tagged
     @tagitems = @tagitems.sort_by(&:name)
     @edit[:pol_items] = session[:tag_items]
     @catinfo = {}
@@ -248,6 +249,7 @@ def policy_sim_build_screen(records = [])
     else
       @all_profs["<select>"] = _("No Policy Profiles are available")
     end
+    @gtl_type = "grid"
     build_targets_hash(@tagitems)
   end
 end
diff --git a/app/decorators/vm_or_template_decorator.rb b/app/decorators/vm_or_template_decorator.rb
index 90df2797dda2..81e2c6cc7645 100644
--- a/app/decorators/vm_or_template_decorator.rb
+++ b/app/decorators/vm_or_template_decorator.rb
@@ -12,6 +12,7 @@ def fileicon
   end
 
   def quadicon(settings = {})
+    show_compliance = settings[:show_compliance] && settings[:policies].present?
     {
       :top_left     => {
         :fileicon => os_image,
@@ -25,7 +26,7 @@ def quadicon(settings = {})
         :fileicon => fileicon,
         :tooltip  => type
       },
-      :bottom_right => settings[:show_compliance] ? compliance_image(settings[:policies]) : total_snapshots
+      :bottom_right => show_compliance ? compliance_image(settings[:policies].keys) : total_snapshots
     }
   end