diff --git a/app/helpers/trestle/format_helper.rb b/app/helpers/trestle/format_helper.rb
index 3d3f05ea..2a83fa8c 100644
--- a/app/helpers/trestle/format_helper.rb
+++ b/app/helpers/trestle/format_helper.rb
@@ -39,13 +39,13 @@ def autoformat_value(value, options={})
           content_tag(:span, blank, class: "blank")
         end
       when String
-        if value.html_safe? || options[:truncate] == false
+        if value.html_safe? || options.fetch(:truncate, false) == false
           value
         else
           truncate(value, options[:truncate] || {})
         end
       when ->(value) { value.respond_to?(:id) }
-        display(value)
+        autoformat_value(display(value), options)
       else
         value
       end