diff --git a/app/helpers/breadcrumb_helper.rb b/app/helpers/breadcrumb_helper.rb
index <HASH>..<HASH> 100644
--- a/app/helpers/breadcrumb_helper.rb
+++ b/app/helpers/breadcrumb_helper.rb
@@ -208,7 +208,7 @@ module BreadcrumbHelper
       if perm.all_tags
         tags = 'all'
       else
-        tags = perm.tags.collect { |t| t.formatted(perm.resource_type.name) }
+        tags = perm.tag_values.collect { |t| Tag.formatted(perm.resource_type.name, t) }
       end
       
       if global
diff --git a/app/models/tag.rb b/app/models/tag.rb
index <HASH>..<HASH> 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -13,13 +13,17 @@
 require 'util/model_util'
 
 class Tag
-  def formatted(resource_type_name)
+  def self.formatted(resource_type_name, tag_id)
     model_klass = ResourceType::TYPES[resource_type_name][:model]
         
     if model_klass
-      tags = model_klass.tags(self.name) if model_klass.respond_to? :tags
-      return tags[0]
+      tags = model_klass.tags(tag_id) rescue []
+      return tags[0] if tags && !tags.empty?
+    else
+      raise "Unrecognized model #{model_klass}"
     end
+
+    tag_id
   end
 
   def self.tags_for(resource_type_name, organization_id)
Fix to get tags.formatted to work with the new changes