diff --git a/app/models/etd.rb b/app/models/etd.rb
index 007531b73..d60a84d03 100644
--- a/app/models/etd.rb
+++ b/app/models/etd.rb
@@ -129,7 +129,7 @@ def toc_embargoed
   end
 
   property :embargo_length, predicate: "http://purl.org/spar/fabio/hasEmbargoDuration", multiple: false do |index|
-    index.as :displayable
+    index.as :stored_sortable
   end
 
   # should always be Emory University (http://id.loc.gov/vocabulary/organizations/geu)
diff --git a/app/models/solr_document.rb b/app/models/solr_document.rb
index 56d820153..5160d8dc3 100644
--- a/app/models/solr_document.rb
+++ b/app/models/solr_document.rb
@@ -93,7 +93,7 @@ def description
   end
 
   def embargo_length
-    self['embargo_length_ssm']
+    self['embargo_length_ssi']
   end
 
   def graduation_year
diff --git a/app/presenters/etd_presenter.rb b/app/presenters/etd_presenter.rb
index 6e53dcb85..afdbdfe7f 100644
--- a/app/presenters/etd_presenter.rb
+++ b/app/presenters/etd_presenter.rb
@@ -120,7 +120,7 @@ def abstract_for_admin
         if degree_awarded
           "[Abstract embargoed until #{formatted_embargo_release_date}] "
         elsif embargo_length
-          "[Abstract embargoed until #{embargo_length.first} post-graduation] "
+          "[Abstract embargoed until #{embargo_length} post-graduation] "
         else
           "[Abstract embargoed until post-graduation] "
         end
@@ -154,7 +154,7 @@ def toc_for_admin
     if embargo_release_date && toc_embargoed
       admin_return_message +=
         if embargo_length && !degree_awarded
-          "[Table of contents embargoed until #{embargo_length.first} post-graduation] "
+          "[Table of contents embargoed until #{embargo_length} post-graduation] "
         elsif embargo_release_date
           "[Table of contents embargoed until #{formatted_embargo_release_date}] "
         else