diff --git a/db.py b/db.py
index e6420b1..3a3c8ae 100644
--- a/db.py
+++ b/db.py
@@ -268,10 +268,10 @@ class DataBase():
     def get_tags_for_person(self, person_id):
         return self.execute("""
             SELECT
-                T.tag_id AS "TagId",
-                T.person_id AS "PersonId",
-                T.name AS "TagName",
-                T.filter AS "TagFilter"
+                T.tag_id as "tag_id",
+                T.person_id as "person_id",
+                T.name AS "tag_name",
+                T.filter AS "tag_filter"
             FROM
                 Tag T
             WHERE
@@ -298,10 +298,10 @@ class DataBase():
     def get_tags_for_dashboard(self):
         return self.execute("""
             SELECT
-                T.tag_id AS "TagId",
-                T.person_id AS "PersonId",
-                T.name AS "TagName",
-                T.filter AS "TagFilter"
+                T.tag_id AS "tag_id",
+                T.person_id AS "person_id",
+                T.name AS "tag_name",
+                T.filter AS "tag_filter"
             FROM
                 Tag T
             WHERE
@@ -311,12 +311,12 @@ class DataBase():
 
     def add_or_update_tag_for_dashboard(self, tag_name, tag_filter):
         # check if a tag exists for dashboard with the same tag_name
-        tag = self.execute('SELECT tag_id AS "TagId" FROM Tag WHERE person_id IS NULL AND name=%s LIMIT 1', [
+        tag = self.execute('SELECT tag_id AS "tag_id" FROM Tag WHERE person_id IS NULL AND name=%s LIMIT 1', [
             tag_name], one=True)
         if tag:
             # update the tag
             self.execute('UPDATE Tag SET filter=%s WHERE tag_id=%s', [
-                         tag_filter, tag['TagId']], commit=True)
+                         tag_filter, tag['tag_id']], commit=True)
         else:
             self.execute('INSERT INTO Tag (name, filter) VALUES (%s, %s)', [
                 tag_name, tag_filter], commit=True)
diff --git a/templates/dashboard.html b/templates/dashboard.html
index 51fd1ce..627ed00 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -91,9 +91,8 @@
             </div>
         </div>
     </div>
-    {% with person_id=None, tags=tags %}
-    {% include 'partials/tags.html' %}
-    {% endwith %}
+
+    {{ render_partial('partials/tags.html',person_id=None, tags=tags) }}
 </div>
 
 
diff --git a/templates/partials/tags.html b/templates/partials/tags.html
index 6c548d6..f4e40b2 100644
--- a/templates/partials/tags.html
+++ b/templates/partials/tags.html
@@ -5,18 +5,18 @@
         class="[word-wrap: break-word] my-[5px] mr-4 flex h-[32px] cursor-pointer items-center justify-between rounded-[16px] border border-[#9fa6b2] bg-[#eceff1] bg-[transparent] py-0 px-[12px] text-[13px] font-normal normal-case leading-loose text-[#4f4f4f] shadow-none transition-[opacity] duration-300 ease-linear hover:border-[#9fa6b2] hover:!shadow-none dark:text-neutral-200"
         data-te-ripple-color="dark">
         <span hx-get="{{ url_for('goto_tag') }}" {% if person_id %}
-            hx-vals='{"filter": "{{ t["TagFilter"] }}", "person_id": "{{ person_id }}"}' {% else %}
-            hx-vals='{"filter": "{{ t["TagFilter"] }}"}' {% endif%} hx-target="#container" hx-push-url="true">{{
-            t['TagName'] }}</span>
+            hx-vals='{"filter": "{{ t["tag_filter"] }}", "person_id": "{{ person_id }}"}' {% else %}
+            hx-vals='{"filter": "{{ t["tag_filter"] }}"}' {% endif%} hx-target="#container" hx-push-url="true">{{
+            t['tag_name'] }}</span>
 
 
         <span
             class="float-right w-4 cursor-pointer pl-[8px] text-[16px] text-[#afafaf] opacity-[.53] transition-all duration-200 ease-in-out hover:text-[#8b8b8b] dark:text-neutral-400 dark:hover:text-neutral-100"
-            hx-get="{{ url_for('delete_tag', tag_id=t['TagId']) }}" {% if person_id %}
-            hx-vals='{"filter": "{{ t["TagFilter"] }}", "person_id": "{{ person_id }}"}' {% else %}
-            hx-vals='{"filter": "{{ t["TagFilter"] }}"}' {% endif%} hx-target="#container" hx-push-url="true" _="on htmx:confirm(issueRequest)
+            hx-get="{{ url_for('delete_tag', tag_id=t['tag_id']) }}" {% if person_id %}
+            hx-vals='{"filter": "{{ t["tag_filter"] }}", "person_id": "{{ person_id }}"}' {% else %}
+            hx-vals='{"filter": "{{ t["tag_filter"] }}"}' {% endif%} hx-target="#container" hx-push-url="true" _="on htmx:confirm(issueRequest)
      halt the event
-     call Swal.fire({title: 'Confirm', text:'Are you sure you want to delete {{ t['TagName'] }} tag?'})
+     call Swal.fire({title: 'Confirm', text:'Are you sure you want to delete {{ t['tag_name'] }} tag?'})
      if result.isConfirmed issueRequest()">
             <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
                 stroke="currentColor" class="h-3 w-3">
diff --git a/templates/person.html b/templates/person.html
index a2f24e3..1296ffd 100644
--- a/templates/person.html
+++ b/templates/person.html
@@ -98,9 +98,7 @@
             </div>
         </div>
 
-        {% with person_id=person['PersonId'], tags=tags %}
-        {% include 'partials/tags.html' %}
-        {% endwith %}
+        {{ render_partial('partials/tags.html',person_id=person['PersonId'], tags=tags) }}
 
         <div class="flex flex-col mt-3 w-screen sm:w-full overflow-auto">
             <div class="overflow-x-auto rounded-lg">