diff --git a/inventory/routes/helpers.py b/inventory/routes/helpers.py
index d39ed69..7dbedb2 100644
--- a/inventory/routes/helpers.py
+++ b/inventory/routes/helpers.py
@@ -78,7 +78,7 @@ user_headers = {
     "Last Name":  lambda i: {"field": "last_name","text": i.last_name},
     "First Name": lambda i: {"field": "first_name","text": i.first_name},
     "Title":      lambda i: {"field": "title","text": i.title},
-    "Supervisor": lambda i: {"field": "supervisor,identifier","text": i.supervisor.identifier, "url": url_for("main.user", id=i.supervisor.id)} if i.supervisor else {"text": None},
+    "Supervisor": lambda i: {"field": "supervisor,identifier","text": i.supervisor.identifier, "url": url_for("main.user_item", id=i.supervisor.id)} if i.supervisor else {"text": None},
     "Location":   lambda i: {"field": "location,identifier","text": i.location.identifier} if i.location else {"text": None},
     "Staff?":     lambda i: {"field": "staff","text": i.staff, "type": "bool", "html": checked_box if i.staff else unchecked_box},
     "Active?":    lambda i: {"field": "active","text": i.active, "type": "bool", "html": checked_box if i.active else unchecked_box}
diff --git a/inventory/templates/index.html b/inventory/templates/index.html
index ae37f15..4e0fc6f 100644
--- a/inventory/templates/index.html
+++ b/inventory/templates/index.html
@@ -28,7 +28,7 @@
                     headers = active_worklog_headers,
                     rows = active_worklog_rows,
                     id = 'Active Worklog',
-                    entry_route = 'worklog_entry',
+                    entry_route = 'worklog_item',
                     per_page = 10
                     )}}
                 </div>
diff --git a/inventory/templates/search.html b/inventory/templates/search.html
index 8650bd3..e00836f 100644
--- a/inventory/templates/search.html
+++ b/inventory/templates/search.html
@@ -31,7 +31,7 @@
         {{ tables.render_table(
         headers = results['users']['headers'],
         rows = results['users']['rows'],
-        entry_route = 'user',
+        entry_route = 'user_item',
         title='User Results',
         id='search-users'
         )}}
@@ -42,7 +42,7 @@
         {{ tables.render_table(
         headers = results['worklog']['headers'],
         rows = results['worklog']['rows'],
-        entry_route = 'worklog_entry',
+        entry_route = 'worklog_item',
         title='Worklog Results',
         id='search-worklog'
         )}}
diff --git a/inventory/templates/user_org.html b/inventory/templates/user_org.html
index 450a9a7..11b85a7 100644
--- a/inventory/templates/user_org.html
+++ b/inventory/templates/user_org.html
@@ -10,7 +10,7 @@
         <div class="card border border-primary border-2" style="width: 15rem;">
             <div class="card-body">
                 <h5 class="card-title text-center">
-                    {{ layer.user.first_name }} {{ layer.user.last_name }}<br />{{ links.entry_link('user', layer.user.id) }}
+                    {{ layer.user.first_name }} {{ layer.user.last_name }}<br />{{ links.entry_link('user_item', layer.user.id) }}
                 </h5>
                 <div class="card-text text-center">
                     {% if layer.user.title %}
@@ -42,7 +42,7 @@
                             {% if subordinate.title %}
                                 ({{ subordinate.title }})<br />
                             {% endif %}
-                            {{ links.entry_link('user', subordinate.id) }}
+                            {{ links.entry_link('user_item', subordinate.id) }}
                         </div>
                     </div>
                 </div>