diff --git a/app/controllers/doctrines_controller.rb b/app/controllers/doctrines_controller.rb
index 5d8a2fa..1c47891 100644
--- a/app/controllers/doctrines_controller.rb
+++ b/app/controllers/doctrines_controller.rb
@@ -25,7 +25,7 @@ class DoctrinesController < ApplicationController
   def show
     @jurisprudence = @doctrine.doctrine_jurisprudences.present? ? @doctrine.doctrine_jurisprudences.first.jurisprudence : nil
 
-    search = annotation_search(params.permit(:page, :per_page))
+    search = annotation_search({ doctrine_id: @doctrine.id })
     @annotations = search.results
   end
 
diff --git a/app/controllers/document/doctrines_controller.rb b/app/controllers/document/doctrines_controller.rb
index 14f4349..0b767a3 100644
--- a/app/controllers/document/doctrines_controller.rb
+++ b/app/controllers/document/doctrines_controller.rb
@@ -6,7 +6,7 @@ class Document::DoctrinesController < ApplicationController
 
 
   def show
-    search = annotation_search(params.permit(:page, :per_page))
+    search = annotation_search({ doctrine_id: @doctrine.id })
     @annotations = search.results
   end
 end
diff --git a/app/javascript/controllers/annotations_controller.js b/app/javascript/controllers/annotations_controller.js
index 7663531..50a2119 100644
--- a/app/javascript/controllers/annotations_controller.js
+++ b/app/javascript/controllers/annotations_controller.js
@@ -110,6 +110,6 @@ export default class extends ApplicationController {
   }
 
   paginate () {
-    this.stimulate("AnnotationReflex#render_annotations_views", { page: this.element.dataset["page"] })
+    this.stimulate("AnnotationReflex#render_annotations_views", { doctrine_id: this.element.dataset["doctrineId"], page: this.element.dataset["page"] })
   }
 }
diff --git a/app/reflexes/annotation_reflex.rb b/app/reflexes/annotation_reflex.rb
index 88b5386..dfff1c0 100644
--- a/app/reflexes/annotation_reflex.rb
+++ b/app/reflexes/annotation_reflex.rb
@@ -14,6 +14,7 @@ class AnnotationReflex < ApplicationReflex
   def render_annotations_views(search_params)
     search = annotation_search(search_params)
     @annotations = search.results
-    morph "#annotationsIndexView", render(partial: "/shared/annotations_index_view", locals: { annotations: @annotations, opts: { current_page: search_params[:page] } })
+    morph "#annotationsIndexView", render(partial: "/shared/annotations_index_view", locals: { annotations: @annotations, 
+          opts: { doctrine_id: search_params[:doctrine_id], current_page: search_params[:page] } })
   end
 end
diff --git a/app/views/shared/_annotated_documents_search_results.html.erb b/app/views/shared/_annotated_documents_search_results.html.erb
index 5a9b69c..7aaa40c 100644
--- a/app/views/shared/_annotated_documents_search_results.html.erb
+++ b/app/views/shared/_annotated_documents_search_results.html.erb
@@ -33,14 +33,16 @@
           <% end %>
 
           <% documents.total_pages.times do |page| -%>
-            <% if opts[:current_page].to_i.eql?(page + 1) %>
-              <span class="page-item page current page-link"> <%= page + 1 %> </span>
-            <% else %>
-            <span class="page-item page <%= 'current' if opts[:current_page].to_i.eql?(page + 1) %>">
-              <a class="page-link <%= 'current' if opts[:current_page].to_i.eql?(page + 1) %>" 
-                 data-controller="annotations" data-q="<%= opts[:q] %>" data-page="<%= page + 1 %>" 
-                 data-action="click->annotations#paginateDocuments"> <%= page + 1 %> </a>
-            </span>
+            <% if (page + 1) <= (opts[:current_page].to_i + 4) && (page + 1) >= (opts[:current_page].to_i - 4) %>
+              <% if opts[:current_page].to_i.eql?(page + 1) %>
+                <span class="page-item page current page-link"> <%= page + 1 %> </span>
+              <% else %>
+              <span class="page-item page <%= 'current' if opts[:current_page].to_i.eql?(page + 1) %>">
+                <a class="page-link <%= 'current' if opts[:current_page].to_i.eql?(page + 1) %>" 
+                  data-controller="annotations" data-q="<%= opts[:q] %>" data-page="<%= page + 1 %>" 
+                  data-action="click->annotations#paginateDocuments"> <%= page + 1 %> </a>
+              </span>
+              <% end %>
             <% end %>
           <% end -%>
 
diff --git a/app/views/shared/_annotations_pagination.html.erb b/app/views/shared/_annotations_pagination.html.erb
index 3697169..11500de 100644
--- a/app/views/shared/_annotations_pagination.html.erb
+++ b/app/views/shared/_annotations_pagination.html.erb
@@ -10,43 +10,44 @@
         <nav class="pagination pagination-sm" role="navigation" aria-label="pager">
           <% unless  annotations.first_page? %>
             <span class="page-item first">
-              <a class="page-link" data-controller="annotations" data-page="<%= 1 %>" data-action="click->annotations#paginate">
+              <a class="page-link" data-controller="annotations" data-doctrine-id="<%= opts[:doctrine_id] %>" 
+                  data-page="<%= 1 %>" data-action="click->annotations#paginate">
                 <i class="fas fa-angle-double-left"></i>
               </a>
             </span>
 
             <span class="page-item prev">
-              <a class="page-link" data-controller="annotations" data-page="<%= opts[:current_page].to_i - 1 %>" 
-                 data-action="click->annotations#paginate">
+              <a class="page-link" data-controller="annotations" data-doctrine-id="<%= opts[:doctrine_id] %>" 
+                  data-page="<%= opts[:current_page].to_i - 1 %>"  data-action="click->annotations#paginate">
                 <i class="fas fa-angle-left"></i>
               </a>
             </span>
           <% end %>
 
           <% annotations.total_pages.times do |page| -%>
-            <% if opts[:current_page].to_i.eql?(page + 1) %>
-              <span class="page-item page current page-link"> <%= page + 1 %> </span>
-            <% else %>
-              <span class="page-item page">
-                <a class="page-link" data-controller="annotations" data-page="<%= page + 1 %>" 
-                  data-action="click->annotations#paginate"> <%= page + 1 %> </a>
-              </span>
+            <% if (page + 1) <= (opts[:current_page].to_i + 4) && (page + 1) >= (opts[:current_page].to_i - 4) %>
+              <% if opts[:current_page].to_i.eql?(page + 1) %>
+                <span class="page-item page current page-link"> <%= page + 1 %> </span>
+              <% else %>
+                <span class="page-item page">
+                  <a class="page-link" data-controller="annotations" data-doctrine-id="<%= opts[:doctrine_id] %>"
+                      data-page="<%= page + 1 %>" data-action="click->annotations#paginate"> <%= page + 1 %> </a>
+                </span>
+              <% end %>
             <% end %>
           <% end -%>
 
           <% unless annotations.last_page? %>
             <span class="page-item next">
-              <a class="page-link" data-controller="annotations"
-                data-page="<%= opts[:current_page].to_i + 1 %>" 
-                data-action="click->annotations#paginate">
+              <a class="page-link" data-controller="annotations" data-doctrine-id="<%= opts[:doctrine_id] %>"
+                  data-page="<%= opts[:current_page].to_i + 1 %>" data-action="click->annotations#paginate">
                 <i class="fas fa-angle-right"></i>
               </a>
             </span>
             
             <span class="page-item last">
-              <a class="page-link" data-controller="annotations"
-                data-page="<%= annotations.total_pages %>" 
-                data-action="click->annotations#paginate">
+              <a class="page-link" data-controller="annotations" data-doctrine-id="<%= opts[:doctrine_id] %>"
+                  data-page="<%= annotations.total_pages %>" data-action="click->annotations#paginate">
                 <i class="fas fa-angle-double-right"></i>
               </a>
             </span>
diff --git a/app/views/shared/_case_lists_search_results.html.erb b/app/views/shared/_case_lists_search_results.html.erb
index 90c860c..f8bedc8 100644
--- a/app/views/shared/_case_lists_search_results.html.erb
+++ b/app/views/shared/_case_lists_search_results.html.erb
@@ -37,15 +37,17 @@
           <% end %>
 
           <% documents.total_pages.times do |page| -%>
-            <% if opts[:current_page].to_i.eql?(page + 1) %>
-              <span class="page-item page current page-link"> <%= page + 1 %> </span>
-            <% else %>
-              <span class="page-item page">
-                <a class="page-link" data-controller="document" data-doctrine-id="<%= opts[:doctrine_id] %>" 
-                  data-q="<%= opts[:q] %>" data-page="<%= page + 1 %>" data-action="click->document#paginate"> 
-                  <%= page + 1 %> 
-                </a>
-              </span>
+            <% if (page + 1) <= (opts[:current_page].to_i + 4) && (page + 1) >= (opts[:current_page].to_i - 4) %>
+              <% if opts[:current_page].to_i.eql?(page + 1) %>
+                <span class="page-item page current page-link"> <%= page + 1 %> </span>
+              <% else %>
+                <span class="page-item page">
+                  <a class="page-link" data-controller="document" data-doctrine-id="<%= opts[:doctrine_id] %>" 
+                    data-q="<%= opts[:q] %>" data-page="<%= page + 1 %>" data-action="click->document#paginate"> 
+                    <%= page + 1 %> 
+                  </a>
+                </span>
+              <% end %>
             <% end %>
           <% end -%>