diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html
index 6416bf0c054fbc94fa9e15cc2b4ed1a0085ef562..d4eb573eb2d3fa6ce5f39f6bec86bd9c30a0af49 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html
@@ -3,7 +3,7 @@
                     <ul class="pagination">
                     {% if page_data.has_prev %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('who.url_divi_country_all', page=page_data.prev_num) }}">Previous</a>
+                        <a class="page-link" href="{{ url_for('divi.url_divi_country_all', page=page_data.prev_num) }}">Previous</a>
                     </li>
                     {% endif %}
                     <!-- all page numbers -->
@@ -11,7 +11,7 @@
                         {% if page_num %}
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
-                                    <a class="page-link" href="{{ url_for('who.url_divi_country_all', page=page_num) }}">{{ page_num }}</a>
+                                    <a class="page-link" href="{{ url_for('divi.url_divi_country_all', page=page_num) }}">{{ page_num }}</a>
                                 </li>
                             {% else %}
                                 <li class="page-item active">
@@ -27,7 +27,7 @@
                     <!-- next page -->
                     {% if page_data.has_next %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('who.url_divi_country_all', page=page_data.next_num) }}">Next</a>
+                        <a class="page-link" href="{{ url_for('divi.url_divi_country_all', page=page_data.next_num) }}">Next</a>
                     </li>
                     {% endif %}
                     </ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html
index 9bb422cda256075da079920a65e3f6c16cc12264..abdc46c94acabd5614aa2a57e698fe9f7e8bd59c 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html
@@ -8,7 +8,7 @@
                     country code
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_region_all') }}">region</a>
+                    <a href="{{ url_for('divi.url_divi_region_all') }}">region</a>
                 </th>
             </tr>
         </thead>
@@ -16,17 +16,17 @@
         {% for divi_country in page_data.items %}
             <tr>
                 <td>
-                    <a href="{{ url_for('who.url_divi_country', country_id=divi_country.id) }}">
+                    <a href="{{ url_for('divi.url_divi_country', country_id=divi_country.id) }}">
                         {{ divi_country.country }}
                     </a>
                 </td>
                 <td>
-                    <a href="{{ url_for('who.url_divi_country', country_id=divi_country.id) }}">
+                    <a href="{{ url_for('divi.url_divi_country', country_id=divi_country.id) }}">
                         {{ divi_country.country_code }}
                     </a>
                 </td>
                 <th>
-                    <a href="{{ url_for('who.url_divi_region', region_id=divi_country.region.id) }}">
+                    <a href="{{ url_for('divi.url_divi_region', region_id=divi_country.region.id) }}">
                         {{ divi_country.region.region }}
                     </a>
                 </th>
@@ -42,7 +42,7 @@
                     country code
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_region_all') }}">region</a>
+                    <a href="{{ url_for('divi.url_divi_region_all') }}">region</a>
                 </th>
             </tr>
         </tfoot>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html
index 2f158697da25b04eaf618e045a177f3d270abccb..71965df974e5b68016adf05e1c8a34e320402993 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html
@@ -3,7 +3,7 @@
                     {% if page_data.has_prev %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'who.url_divi_germany', country_id=divi_country.id, page=page_data.prev_num) }}">
+                           href="{{ url_for('divi.url_divi_germany', country_id=divi_country.id, page=page_data.prev_num) }}">
                             Previous
                         </a>
                     </li>
@@ -13,7 +13,7 @@
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
                                     <a class="page-link"
-                                       href="{{ url_for( 'who.url_divi_germany', country_id=divi_country.id, page=page_num) }}">
+                                       href="{{ url_for('divi.url_divi_germany', country_id=divi_country.id, page=page_num) }}">
                                         {{ page_num }}
                                     </a>
                                 </li>
@@ -31,7 +31,7 @@
                     {% if page_data.has_next %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'who.url_divi_germany', country_id=divi_country.id, page=page_data.next_num) }}">
+                           href="{{ url_for('divi.url_divi_germany', country_id=divi_country.id, page=page_data.next_num) }}">
                             Next
                         </a>
                     </li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html
index ed138a323f1cee4bc255d7f59aaf1afad22f2e57..a4892f3aa219034b411d163e5905f672d77f3f8c 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html
@@ -3,7 +3,7 @@
                     {% if page_data.has_prev %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'who.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_data.prev_num) }}">
+                           href="{{ url_for('divi.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_data.prev_num) }}">
                             Previous
                         </a>
                     </li>
@@ -13,7 +13,7 @@
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
                                     <a class="page-link"
-                                       href="{{ url_for( 'who.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_num) }}">
+                                       href="{{ url_for('divi.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_num) }}">
                                         {{ page_num }}
                                     </a>
                                 </li>
@@ -31,7 +31,7 @@
                     {% if page_data.has_next %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'who.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_data.next_num) }}">
+                           href="{{ url_for('divi.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_data.next_num) }}">
                             Next
                         </a>
                     </li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html
index 5fe0b4fd29b8edb05c003bc3cb008f6d3d80314d..ac8c9a3814e7680762e86f7907e49c325c528cd5 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html
@@ -3,7 +3,7 @@
                     {% if page_data.has_prev %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'who.url_divi_country_cases_new', country_id=divi_country.id, page=page_data.prev_num) }}">
+                           href="{{ url_for('divi.url_divi_country_cases_new', country_id=divi_country.id, page=page_data.prev_num) }}">
                             Previous
                         </a>
                     </li>
@@ -13,7 +13,7 @@
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
                                     <a class="page-link"
-                                       href="{{ url_for( 'who.url_divi_country_cases_new', country_id=divi_country.id, page=page_num) }}">
+                                       href="{{ url_for('divi.url_divi_country_cases_new', country_id=divi_country.id, page=page_num) }}">
                                         {{ page_num }}
                                     </a>
                                 </li>
@@ -31,7 +31,7 @@
                     {% if page_data.has_next %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'who.url_divi_country_cases_new', country_id=divi_country.id, page=page_data.next_num) }}">
+                           href="{{ url_for('divi.url_divi_country_cases_new', country_id=divi_country.id, page=page_data.next_num) }}">
                             Next
                         </a>
                     </li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html
index b21dd80bb69bd7a986feb7b51de47a0c57cb90a8..25f8e2db270314189d16451b8905b3267925b90d 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html
@@ -3,7 +3,7 @@
                     {% if page_data.has_prev %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'who.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_data.prev_num) }}">
+                           href="{{ url_for('divi.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_data.prev_num) }}">
                             Previous
                         </a>
                     </li>
@@ -13,7 +13,7 @@
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
                                     <a class="page-link"
-                                       href="{{ url_for( 'who.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_num) }}">
+                                       href="{{ url_for('divi.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_num) }}">
                                         {{ page_num }}
                                     </a>
                                 </li>
@@ -31,7 +31,7 @@
                     {% if page_data.has_next %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'who.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_data.next_num) }}">
+                           href="{{ url_for('divi.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_data.next_num) }}">
                             Next
                         </a>
                     </li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html
index ef88f3cadf057c59325c23435636274bcba45b62..843cbfeca23f687f597e510119169a0581f4f715 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html
@@ -12,7 +12,7 @@
                     {% if page_data.has_prev %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.prev_num) }}">
+                           href="{{ url_for('divi.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.prev_num) }}">
                             Previous
                         </a>
                     </li>
@@ -22,7 +22,7 @@
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
                                     <a class="page-link"
-                                       href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_num) }}">
+                                       href="{{ url_for('divi.url_divi_country_deaths_new', country_id=divi_country.id, page=page_num) }}">
                                         {{ page_num }}
                                     </a>
                                 </li>
@@ -40,7 +40,7 @@
                     {% if page_data.has_next %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.next_num) }}">
+                           href="{{ url_for('divi.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.next_num) }}">
                             Next
                         </a>
                     </li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html
index b1471e8cc0c01b2854ae2640eb4de587a5c73391..6b83816008307e868eb0c1f8298455a73cd9afeb 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html
@@ -3,7 +3,7 @@
                     {% if page_data.has_prev %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.prev_num) }}">
+                           href="{{ url_for('divi.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.prev_num) }}">
                             Previous
                         </a>
                     </li>
@@ -13,7 +13,7 @@
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
                                     <a class="page-link"
-                                       href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_num) }}">
+                                       href="{{ url_for('divi.url_divi_country_deaths_new', country_id=divi_country.id, page=page_num) }}">
                                         {{ page_num }}
                                     </a>
                                 </li>
@@ -31,7 +31,7 @@
                     {% if page_data.has_next %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.next_num) }}">
+                           href="{{ url_for('divi.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.next_num) }}">
                             Next
                         </a>
                     </li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html
index ac27722a60b9b3f4186a6c545e80375113b5d3f8..0eb916d349097121b7c86c709fcdee2c2d8a59fb 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html
@@ -3,7 +3,7 @@
                     {% if page_data.has_prev %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'who.url_divi_country', country_id=divi_country.id, page=page_data.prev_num) }}">
+                           href="{{ url_for('divi.url_divi_country', country_id=divi_country.id, page=page_data.prev_num) }}">
                             Previous
                         </a>
                     </li>
@@ -13,7 +13,7 @@
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
                                     <a class="page-link"
-                                       href="{{ url_for( 'who.url_divi_country', country_id=divi_country.id, page=page_num) }}">
+                                       href="{{ url_for('divi.url_divi_country', country_id=divi_country.id, page=page_num) }}">
                                         {{ page_num }}
                                     </a>
                                 </li>
@@ -31,7 +31,7 @@
                     {% if page_data.has_next %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'who.url_divi_country', country_id=divi_country.id, page=page_data.next_num) }}">
+                           href="{{ url_for('divi.url_divi_country', country_id=divi_country.id, page=page_data.next_num) }}">
                             Next
                         </a>
                     </li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html
index 5183d720619c78dc3c111ee88f40c2748a7d15d9..00f8465403c8e23d8c40b542d1e3de07bb4f7f84 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html
@@ -2,42 +2,42 @@
         <thead class="table-secondary">
             <tr>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_date_reported_all') }}">
+                    <a href="{{ url_for('divi.url_divi_date_reported_all') }}">
                         date reported
                     </a>
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_country_deaths_new',country_id=divi_country.id) }}">
+                    <a href="{{ url_for('divi.url_divi_country_deaths_new',country_id=divi_country.id) }}">
                         deaths new
                     </a>
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_country_cases_new',country_id=divi_country.id) }}">
+                    <a href="{{ url_for('divi.url_divi_country_cases_new',country_id=divi_country.id) }}">
                         cases new
                     </a>
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_country_deaths_cumulative',country_id=divi_country.id) }}">
+                    <a href="{{ url_for('divi.url_divi_country_deaths_cumulative',country_id=divi_country.id) }}">
                         deaths cumulative
                     </a>
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_country_cases_cumulative',country_id=divi_country.id) }}">
+                    <a href="{{ url_for('divi.url_divi_country_cases_cumulative',country_id=divi_country.id) }}">
                         cases cumulative
                     </a>
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_country_all') }}">
+                    <a href="{{ url_for('divi.url_divi_country_all') }}">
                         country code
                     </a>
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_country_all') }}">
+                    <a href="{{ url_for('divi.url_divi_country_all') }}">
                         country
                     </a>
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_region_all') }}">
+                    <a href="{{ url_for('divi.url_divi_region_all') }}">
                         region
                     </a>
                 </th>
@@ -47,7 +47,7 @@
         {% for divi_global_data in page_data.items %}
             <tr>
                 <th>
-                    <a href="{{ url_for('who.url_divi_date_reported',date_reported_id=divi_global_data.date_reported.id) }}">
+                    <a href="{{ url_for('divi.url_divi_date_reported',date_reported_id=divi_global_data.date_reported.id) }}">
                         {{ divi_global_data.date_reported }}
                     </a>
                 </th>
@@ -64,17 +64,17 @@
                     {{ divi_global_data.cases_cumulative }}
                 </td>
                 <td>
-                    <a href="{{ url_for('who.url_divi_country', country_id=divi_global_data.country.id) }}">
+                    <a href="{{ url_for('divi.url_divi_country', country_id=divi_global_data.country.id) }}">
                         {{ divi_global_data.country.country_code }}
                     </a>
                 </td>
                 <td>
-                    <a href="{{ url_for('who.url_divi_country', country_id=divi_global_data.country.id) }}">
+                    <a href="{{ url_for('divi.url_divi_country', country_id=divi_global_data.country.id) }}">
                         {{ divi_global_data.country.country }}
                     </a>
                 </td>
                 <th>
-                    <a href="{{ url_for('who.url_divi_region', region_id=divi_global_data.country.region.id) }}">
+                    <a href="{{ url_for('divi.url_divi_region', region_id=divi_global_data.country.region.id) }}">
                         {{ divi_global_data.country.region.region }}
                     </a>
                 </th>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html
index 135fc92280a38aeb234fcdf3ad36974c3b8ce8c9..9d0f81316a9ac6a895b915ad2214f92ea8444afc 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html
@@ -3,7 +3,7 @@
                     <ul class="pagination">
                     {% if page_data.has_prev %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('who.url_divi_date_reported_all', page=page_data.prev_num) }}">Previous</a>
+                        <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_all', page=page_data.prev_num) }}">Previous</a>
                     </li>
                     {% endif %}
                     <!-- all page numbers -->
@@ -11,7 +11,7 @@
                         {% if page_num %}
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
-                                    <a class="page-link" href="{{ url_for('who.url_divi_date_reported_all', page=page_num) }}">{{ page_num }}</a>
+                                    <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_all', page=page_num) }}">{{ page_num }}</a>
                                 </li>
                             {% else %}
                                 <li class="page-item active">
@@ -27,7 +27,7 @@
                     <!-- next page -->
                     {% if page_data.has_next %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('who.url_divi_date_reported_all', page=page_data.next_num) }}">Next</a>
+                        <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_all', page=page_data.next_num) }}">Next</a>
                     </li>
                     {% endif %}
                     </ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html
index 02c1fbb81db04c289f2759490ff3e9db174087d3..f59884faf1d63f1c8375e1df902f1001c1fb65d2 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html
@@ -3,7 +3,7 @@
                     <ul class="pagination">
                     {% if page_data.has_prev %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+                        <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_deaths_cumulative',
                         date_reported_id=divi_date_reported.id, page=page_data.prev_num) }}">Previous</a>
                     </li>
                     {% endif %}
@@ -12,7 +12,7 @@
                         {% if page_num %}
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
-                                    <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+                                    <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_deaths_cumulative',
                                     date_reported_id=divi_date_reported.id, page=page_num) }}">{{ page_num }}</a>
                                 </li>
                             {% else %}
@@ -29,7 +29,7 @@
                     <!-- next page -->
                     {% if page_data.has_next %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+                        <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_deaths_cumulative',
                         date_reported_id=divi_date_reported.id, page=page_data.next_num) }}">Next</a>
                     </li>
                     {% endif %}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html
index 5f553699d104789ebff962b6040c20eb16527c09..49cfc12fecc617c39aed4a71de11d41b8e98279f 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html
@@ -3,7 +3,7 @@
                     <ul class="pagination">
                     {% if page_data.has_prev %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('who.url_divi_date_reported_cases_new',
+                        <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_cases_new',
                         date_reported_id=divi_date_reported.id, page=page_data.prev_num) }}">
                             Previous
                         </a>
@@ -14,7 +14,7 @@
                         {% if page_num %}
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
-                                    <a class="page-link" href="{{ url_for('who.url_divi_date_reported_cases_new',
+                                    <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_cases_new',
                                     date_reported_id=divi_date_reported.id, page=page_num) }}">{{ page_num }}</a>
                                 </li>
                             {% else %}
@@ -31,7 +31,7 @@
                     <!-- next page -->
                     {% if page_data.has_next %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('who.url_divi_date_reported_cases_new',
+                        <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_cases_new',
                         date_reported_id=divi_date_reported.id, page=page_data.next_num) }}">Next</a>
                     </li>
                     {% endif %}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html
index 02c1fbb81db04c289f2759490ff3e9db174087d3..f59884faf1d63f1c8375e1df902f1001c1fb65d2 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html
@@ -3,7 +3,7 @@
                     <ul class="pagination">
                     {% if page_data.has_prev %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+                        <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_deaths_cumulative',
                         date_reported_id=divi_date_reported.id, page=page_data.prev_num) }}">Previous</a>
                     </li>
                     {% endif %}
@@ -12,7 +12,7 @@
                         {% if page_num %}
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
-                                    <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+                                    <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_deaths_cumulative',
                                     date_reported_id=divi_date_reported.id, page=page_num) }}">{{ page_num }}</a>
                                 </li>
                             {% else %}
@@ -29,7 +29,7 @@
                     <!-- next page -->
                     {% if page_data.has_next %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+                        <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_deaths_cumulative',
                         date_reported_id=divi_date_reported.id, page=page_data.next_num) }}">Next</a>
                     </li>
                     {% endif %}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html
index aba8dcc65084004bafdd19d488a755a2b74286e0..81064808aab01636116685fc1bef920757307206 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html
@@ -3,7 +3,7 @@
                     <ul class="pagination">
                     {% if page_data.has_prev %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('who.url_divi_date_reported',
+                        <a class="page-link" href="{{ url_for('divi.url_divi_date_reported',
                         date_reported_id=divi_date_reported.id, page=page_data.prev_num) }}">Previous</a>
                     </li>
                     {% endif %}
@@ -12,7 +12,7 @@
                         {% if page_num %}
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
-                                    <a class="page-link" href="{{ url_for('who.url_divi_date_reported',
+                                    <a class="page-link" href="{{ url_for('divi.url_divi_date_reported',
                                     date_reported_id=divi_date_reported.id, page=page_num) }}">{{ page_num }}</a>
                                 </li>
                             {% else %}
@@ -29,7 +29,7 @@
                     <!-- next page -->
                     {% if page_data.has_next %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('who.url_divi_date_reported',
+                        <a class="page-link" href="{{ url_for('divi.url_divi_date_reported',
                         date_reported_id=divi_date_reported.id, page=page_data.next_num) }}">Next</a>
                     </li>
                     {% endif %}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html
index abd0e2f0e3f2281daed68ccde61223b20a994e62..ee420aa662c6dccbfc6299d168b28695839f3f10 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html
@@ -2,42 +2,42 @@
         <thead class="table-secondary">
             <tr>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_date_reported_all') }}">
+                    <a href="{{ url_for('divi.url_divi_date_reported_all') }}">
                         date reported
                     </a>
                 </th>
                 <th scope="col"> who.
-                    <a href="{{ url_for('who.url_divi_date_reported_deaths_new', date_reported_id=divi_date_reported.id) }}">
+                    <a href="{{ url_for('divi.url_divi_date_reported_deaths_new', date_reported_id=divi_date_reported.id) }}">
                     deaths new
                     </a>
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_date_reported_cases_new', date_reported_id=divi_date_reported.id) }}">
+                    <a href="{{ url_for('divi.url_divi_date_reported_cases_new', date_reported_id=divi_date_reported.id) }}">
                     cases new
                     </a>
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_date_reported_deaths_cumulative', date_reported_id=divi_date_reported.id) }}">
+                    <a href="{{ url_for('divi.url_divi_date_reported_deaths_cumulative', date_reported_id=divi_date_reported.id) }}">
                     deaths cumulative
                     </a>
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_date_reported_cases_cumulative', date_reported_id=divi_date_reported.id) }}">
+                    <a href="{{ url_for('divi.url_divi_date_reported_cases_cumulative', date_reported_id=divi_date_reported.id) }}">
                     cases cumulative
                     </a>
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_country_all') }}">
+                    <a href="{{ url_for('divi.url_divi_country_all') }}">
                         country code
                     </a>
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_country_all') }}">
+                    <a href="{{ url_for('divi.url_divi_country_all') }}">
                         country
                     </a>
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for('who.url_divi_region_all') }}">
+                    <a href="{{ url_for('divi.url_divi_region_all') }}">
                         region
                     </a>
                 </th>
@@ -47,7 +47,7 @@
         {% for divi_global_data in page_data.items %}
             <tr>
                 <th>
-                    <a href="{{ url_for('who.url_divi_date_reported', date_reported_id=divi_global_data.date_reported.id) }}">
+                    <a href="{{ url_for('divi.url_divi_date_reported', date_reported_id=divi_global_data.date_reported.id) }}">
                         {{ divi_global_data.date_reported }}
                     </a>
                 </th>
@@ -64,17 +64,17 @@
                     {{ divi_global_data.cases_cumulative }}
                 </td>
                 <td>
-                    <a href="{{ url_for('who.url_divi_country', country_id=divi_global_data.country.id ) }}">
+                    <a href="{{ url_for('divi.url_divi_country', country_id=divi_global_data.country.id ) }}">
                         {{ divi_global_data.country.country_code }}
                     </a>
                 </td>
                 <td>
-                    <a href="{{ url_for('who.url_divi_country', country_id=divi_global_data.country.id) }}">
+                    <a href="{{ url_for('divi.url_divi_country', country_id=divi_global_data.country.id) }}">
                         {{ divi_global_data.country.country }}
                     </a>
                 </td>
                 <th>
-                    <a href="{{ url_for('who.url_divi_region', region_id=divi_global_data.country.region.id) }}">
+                    <a href="{{ url_for('divi.url_divi_region', region_id=divi_global_data.country.region.id) }}">
                         {{ divi_global_data.country.region.region }}
                     </a>
                 </th>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html b/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
index 5baf486a02b781df962e10800a017ca0ecdbe7ea..27c195b2ee48c01298e21ce58883fe4b4c13ad19 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
@@ -9,29 +9,29 @@
             <div class="col">
                 <div class="btn-group-vertical" role="group" aria-label="Views">
                     <a class="btn btn-primary btn-lg btn-block text-left"
-                       href="{{ url_for( 'who.url_task_divi_update_star_schema_initial') }}"
+                       href="{{ url_for('divi.url_task_divi_update_star_schema_initial') }}"
                        role="button">WHO :: Task :: update :: star_schema :: initial</a>
                     <a class="btn btn-primary btn-lg btn-block text-left"
-                       href="{{ url_for( 'who.url_task_divi_update_star_schema_incremental') }}"
+                       href="{{ url_for('divi.url_task_divi_update_star_schema_incremental') }}"
                        role="button">WHO :: Task :: update :: star_schema :: incremental</a>
                 </div>
             </div>
             <div class="col">
                 <div class="btn-group-vertical" role="group" aria-label="Views">
                     <a class="btn btn-success btn-lg btn-block text-left"
-                       href="{{ url_for( 'who.url_task_divi_download_only') }}"
+                       href="{{ url_for('divi.url_task_divi_download_only') }}"
                        role="button">WHO :: Task :: download :: only</a>
                     <a class="btn btn-info btn-lg btn-block text-left"
-                       href="{{ url_for( 'who.url_task_divi_import_only') }}"
+                       href="{{ url_for('divi.url_task_divi_import_only') }}"
                        role="button">WHO :: Task :: import :: only</a>
                     <a class="btn btn-warning btn-lg btn-block text-left"
-                       href="{{ url_for( 'who.url_task_divi_update_dimension_tables_only') }}"
+                       href="{{ url_for('divi.url_task_divi_update_dimension_tables_only') }}"
                        role="button">WHO :: Task :: update :: dimension-tables : only</a>
                     <a class="btn btn-danger btn-lg btn-block text-left"
-                       href="{{ url_for( 'who.url_task_divi_update_fact_table_incremental_only') }}"
+                       href="{{ url_for('divi.url_task_divi_update_fact_table_incremental_only') }}"
                        role="button">WHO :: Task :: update :: fact-table :: only :: incremental</a>
                     <a class="btn btn-secondary btn-lg btn-block text-left"
-                       href="{{ url_for( 'who.url_task_divi_update_fact_table_initial_only') }}"
+                       href="{{ url_for('divi.url_task_divi_update_fact_table_initial_only') }}"
                        role="button">WHO :: Task :: update :: fact-table :: only :: initial</a>
                 </div>
             </div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html
index a0f6a956f97094fac37ab5f95b7eecf69e60cd8b..eed721952af272553739806a9343b2105687316c 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html
@@ -4,7 +4,7 @@
                     {% if page_data.has_prev %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for('who.url_divi_imported', page=page_data.prev_num) }}">Previous</a>
+                           href="{{ url_for('divi.url_divi_imported', page=page_data.prev_num) }}">Previous</a>
                     </li>
                     {% endif %}
                     <!-- all page numbers -->
@@ -13,7 +13,7 @@
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
                                     <a class="page-link"
-                                       href="{{ url_for('who.url_divi_imported', page=page_num) }}">{{ page_num }}</a>
+                                       href="{{ url_for('divi.url_divi_imported', page=page_num) }}">{{ page_num }}</a>
                                 </li>
                             {% else %}
                                 <li class="page-item active">
@@ -30,7 +30,7 @@
                     {% if page_data.has_next %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for('who.url_divi_imported', page=page_data.next_num) }}">Next</a>
+                           href="{{ url_for('divi.url_divi_imported', page=page_data.next_num) }}">Next</a>
                     </li>
                     {% endif %}
                     </ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html
index 9f75943a2460e82b990e54c9054f517cb7174b31..27ad588fc7ab87ffbe5bad7793d02e96cf25f891 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html
@@ -2,7 +2,7 @@
         <thead class="table-secondary">
             <tr>
                 <th scope="col">
-                    <a href="{{ url_for( 'who.url_divi_date_reported_all') }}">
+                    <a href="{{ url_for('divi.url_divi_date_reported_all') }}">
                         date reported
                     </a>
                 </th>
@@ -19,17 +19,17 @@
                     cases cumulative
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for( 'who.url_divi_country_all') }}">
+                    <a href="{{ url_for('divi.url_divi_country_all') }}">
                         country code
                     </a>
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for( 'who.url_divi_country_all') }}">
+                    <a href="{{ url_for('divi.url_divi_country_all') }}">
                         country
                     </a>
                 </th>
                 <th scope="col">
-                    <a href="{{ url_for( 'who.url_divi_region_all') }}">
+                    <a href="{{ url_for('divi.url_divi_region_all') }}">
                         region
                     </a>
                 </th>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html
index 54554445dee597fe0c4068175e35eaac2155e8df..a04ad858826b3e484b4fc1baedcdcde52ac86056 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html
@@ -4,7 +4,7 @@
                     <!-- previous page -->
                     {% if page_data.has_prev %}
                     <li>
-                        <a href="{{ url_for('who.url_divi_region_all', page=page_data.prev_num) }}">
+                        <a href="{{ url_for('divi.url_divi_region_all', page=page_data.prev_num) }}">
                             Previous
                         </a>
                     </li>
@@ -14,7 +14,7 @@
                         {% if page_num %}
                             {% if page_num != page_data.page %}
                                 <li>
-                                    <a href="{{ url_for('who.url_divi_region_all', page=page_num) }}">
+                                    <a href="{{ url_for('divi.url_divi_region_all', page=page_num) }}">
                                         {{ page_num }}
                                     </a>
                                 </li>
@@ -32,7 +32,7 @@
                     <!-- next page -->
                     {% if page_data.has_next %}
                     <li>
-                        <a href="{{ url_for('who.url_divi_region_all', page=page_data.next_num) }}">
+                        <a href="{{ url_for('divi.url_divi_region_all', page=page_data.next_num) }}">
                             Next
                         </a>
                     </li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html
index fe39c12564322ce7e4b40edf2aba334a2d05667a..eab5c8db103cb3100cab69a85fdc41b33be6909d 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html
@@ -3,7 +3,7 @@
                     <ul class="pagination">
                     {% if page_data.has_prev %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('who.url_divi_region',
+                        <a class="page-link" href="{{ url_for('divi.url_divi_region',
                         region_id=divi_region.id , page=page_data.prev_num) }}">Previous</a>
                     </li>
                     {% endif %}
@@ -12,7 +12,7 @@
                         {% if page_num %}
                             {% if page_num != page_data.page %}
                                 <li class="page-item">
-                                    <a class="page-link" href="{{ url_for('who.url_divi_region',
+                                    <a class="page-link" href="{{ url_for('divi.url_divi_region',
                                     region_id=divi_region.id ,page=page_num) }}">{{ page_num }}</a>
                                 </li>
                             {% else %}
@@ -29,7 +29,7 @@
                     <!-- next page -->
                     {% if page_data.has_next %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('who.url_divi_region',
+                        <a class="page-link" href="{{ url_for('divi.url_divi_region',
                         region_id=divi_region.id , page=page_data.next_num) }}">Next</a>
                     </li>
                 {% endif %}