diff --git a/src/main/resources/templates/fragments/owners.html b/src/main/resources/templates/fragments/owners.html
index 3acf591..75ca0ce 100644
--- a/src/main/resources/templates/fragments/owners.html
+++ b/src/main/resources/templates/fragments/owners.html
@@ -47,7 +47,7 @@ <h2>Owners</h2>
     <tr th:each="owner : ${listOwners}">
       <td>
         <a th:href="@{/owners/__${owner.id}__}" th:text="${owner.firstName + ' ' + owner.lastName}"
-           th:attr="hx-get=@{/owners/__${owner.id}__}" hx-target="#block-content"/></a>
+           hx:get="@{/owners/__${owner.id}__}" hx-target="#block-content"/></a>
       </td>
       <td th:text="${owner.address}"/>
       <td th:text="${owner.city}"/>
@@ -83,10 +83,10 @@ <h2>Owner Information</h2>
     </tr>
   </table>
 
-  <a th:attr="hx-get=@{__${owner.id}__/edit}" hx-target="#block-content" th:href="@{__${owner.id}__/edit}"
+  <a hx:get="@{__${owner.id}__/edit}" hx-target="#block-content" th:href="@{__${owner.id}__/edit}"
      class="btn btn-primary">Edit
     Owner</a>
-  <a th:attr="hx-get=@{__${owner.id}__/pets/new}" th:href="@{__${owner.id}__/pets/new}" hx-target="#block-content" class="btn btn-primary">Add
+  <a hx:get="@{__${owner.id}__/pets/new}" th:href="@{__${owner.id}__/pets/new}" hx-target="#block-content" class="btn btn-primary">Add
     New Pet</a>
 </div>
 
@@ -122,9 +122,9 @@ <h2>Pets and Visits</h2>
           </tr>
           <tr>
             <td><a th:href="@{__${owner.id}__/pets/__${pet.id}__/edit}"
-                   th:attr="hx-get=@{__${owner.id}__/pets/__${pet.id}__/edit}" hx-target="#block-content">Edit Pet</a></td>
+                   hx-get="@{__${owner.id}__/pets/__${pet.id}__/edit}" hx-target="#block-content">Edit Pet</a></td>
             <td><a th:href="@{__${owner.id}__/pets/__${pet.id}__/visits/new}"
-                   th:attr="hx-get=@{__${owner.id}__/pets/__${pet.id}__/visits/new}" hx-target="#block-content">Add Visit</a></td>
+                   hx:get="@{__${owner.id}__/pets/__${pet.id}__/visits/new}" hx-target="#block-content">Add Visit</a></td>
           </tr>
         </table>
       </td>
diff --git a/src/main/resources/templates/fragments/pagination.html b/src/main/resources/templates/fragments/pagination.html
index 5df8ef7..fb16007 100644
--- a/src/main/resources/templates/fragments/pagination.html
+++ b/src/main/resources/templates/fragments/pagination.html
@@ -1,10 +1,10 @@
 <span th:fragment="item(url,page,condition)" th:tag="remove">
-  <a th:if="${condition}" th:attr="hx-get=@{${url} + '?page=' + ${page}}" th:href="@{'/owners?page=' + ${page}}" hx-target="#block-content">[[${page}]]</a>
+  <a th:if="${condition}" hx:get="@{${url}(page=${page})}" th:href="@{${url}(page=${page})}" hx-target="#block-content">[[${page}]]</a>
   <span th:unless="${condition}">[[${page}]]</span>
 </span>
 
 <span th:fragment="control(url, page,condition,title,class)" th:tag="remove">
-  <a th:if="${condition}" th:attr="hx-get=@{${url} + '?page=' + ${page}}" th:href="@{'/owners?page=' + ${page}}" hx-target="#block-content" th:title="${title}" th:class="${class}"></a>
+  <a th:if="${condition}" hx:get="@{${url}(page=${page})}" th:href="@{${url}(page=${page})}" hx-target="#block-content" th:title="${title}" th:class="${class}"></a>
   <span th:unless="${condition}" th:title="${title}" th:class="${class}"></span>
 </span>