diff --git a/app/views/catalog/_index_gallery_collection_wrapper.html.erb b/app/views/catalog/_index_gallery_collection_wrapper.html.erb
index 339cb6b89..34a84edd7 100644
--- a/app/views/catalog/_index_gallery_collection_wrapper.html.erb
+++ b/app/views/catalog/_index_gallery_collection_wrapper.html.erb
@@ -2,7 +2,7 @@
 <div class="document col-6 col-md-3">
   <div class="thumbnail">
     <% value = collection_thumbnail(document, {}, counter: document_counter_with_offset(document_counter)) %>
-    <%= link_to value, generate_work_url(document.to_h, request)%>
+    <%= link_to value, generate_work_url(document, request)%>
     <div class="caption">
       <%= render_document_partials document, blacklight_config.view_config(:gallery).partials, :document_counter => document_counter %>
     </div>
diff --git a/app/views/catalog/_index_header_list_collection.html.erb b/app/views/catalog/_index_header_list_collection.html.erb
index 290358347..e0c78e0b2 100644
--- a/app/views/catalog/_index_header_list_collection.html.erb
+++ b/app/views/catalog/_index_header_list_collection.html.erb
@@ -2,7 +2,7 @@
 
 <div class="search-results-title-row col-12 d-flex flex-row align-items-center pb-2">
   <%# OVERRIDE begin %>
-  <h3 class="search-result-title mb-0 pr-3"><%= link_to markdown(document.title_or_label), generate_work_url(document.to_h, request) %></h3>
+  <h3 class="search-result-title mb-0 pr-3"><%= link_to markdown(document.title_or_label), generate_work_url(document, request) %></h3>
   <%# OVERRIDE end %>
   <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
 </div>
diff --git a/app/views/catalog/_thumbnail_list_collection.html.erb b/app/views/catalog/_thumbnail_list_collection.html.erb
index 65b33703a..3812bb250 100644
--- a/app/views/catalog/_thumbnail_list_collection.html.erb
+++ b/app/views/catalog/_thumbnail_list_collection.html.erb
@@ -1,5 +1,5 @@
 <%# Override Hyrax 3.4.1 to remove thumbnail link supression and use default collection thumbnail %>
 <div class="col-md-3">
   <% value = collection_thumbnail(document, {}, counter: document_counter_with_offset(document_counter)) %>
-  <%= link_to value, generate_work_url(document.to_h, request)%>
+  <%= link_to value, generate_work_url(document, request)%>
 </div>
diff --git a/app/views/hyrax/homepage/_recent_document.html.erb b/app/views/hyrax/homepage/_recent_document.html.erb
index 1c606e227..fd5a749a2 100644
--- a/app/views/hyrax/homepage/_recent_document.html.erb
+++ b/app/views/hyrax/homepage/_recent_document.html.erb
@@ -5,7 +5,7 @@
     <div class="col-sm-12">
       <span class="sr-only"><%= t('hyrax.homepage.recently_uploaded.document.title_label') %></span>
       <h3>
-	<%= link_to generate_work_url(recent_document.to_h, request),  data: { turbolinks: block_valkyrie_redirect? } do %>
+	<%= link_to generate_work_url(recent_document, request),  data: { turbolinks: block_valkyrie_redirect? } do %>
 	  <%= markdown("#{render_thumbnail_tag(recent_document, {width: 90}, {suppress_link: true})} #{recent_document.title_or_label}") %>
 	<% end %>
       </h3>
diff --git a/app/views/themes/institutional_repository/hyrax/homepage/_recent_document.html.erb b/app/views/themes/institutional_repository/hyrax/homepage/_recent_document.html.erb
index ff985d23f..ab2bb13d3 100644
--- a/app/views/themes/institutional_repository/hyrax/homepage/_recent_document.html.erb
+++ b/app/views/themes/institutional_repository/hyrax/homepage/_recent_document.html.erb
@@ -1,6 +1,6 @@
 <%# OVERRIDE Hyrax v5.0.0rc2 template for client theming and shared search %>
 <h3 class="sr-only"><%= t('hyrax.homepage.recently_uploaded.document.title_label') %></h3>
-<%= link_to generate_work_url(recent_document.to_h, request) do %>
+<%= link_to generate_work_url(recent_document, request) do %>
   <div class="recently-uploaded col-6 col-md-6 pt-3 pb-3">
     <%= render_thumbnail_tag recent_document, {class: 'img-fluid mx-auto d-block'}, {suppress_link: true} %>
     <div class="recent-doc-title">
diff --git a/app/views/themes/neutral_repository/hyrax/homepage/_recent_document.html.erb b/app/views/themes/neutral_repository/hyrax/homepage/_recent_document.html.erb
index a3a0660bf..1fcb6bbd1 100644
--- a/app/views/themes/neutral_repository/hyrax/homepage/_recent_document.html.erb
+++ b/app/views/themes/neutral_repository/hyrax/homepage/_recent_document.html.erb
@@ -1,5 +1,5 @@
 <h3 class="sr-only"><%= t('hyrax.homepage.recently_uploaded.document.title_label') %></h3>
-<%= link_to(generate_work_url(recent_document.to_h, request)) do %>
+<%= link_to(generate_work_url(recent_document, request)) do %>
   <div class="recently-uploaded pb-3 col-6 col-md-6">
     <%= render_thumbnail_tag recent_document, {class: 'img-fluid mx-auto d-block'}, {suppress_link: true} %>
     <div class="recent-doc-title">