diff --git a/routes/dns.js b/routes/dns.js
index f271132..cfa7c23 100644
--- a/routes/dns.js
+++ b/routes/dns.js
@@ -40,7 +40,7 @@ router.get('/dns/edit/:domainId', authMw.AllowIfAuthenticated, async (req, res,
 
     for(const [key, value] of Object.entries(rawRecords)) {
         let parsedVal = JSON.parse(value);
-        let finalRecord = {};
+        let finalRecord = {_key: key};
         let recordType = undefined;
 
         for(const [key, value] of Object.entries(parsedVal)) {
@@ -57,7 +57,7 @@ router.get('/dns/edit/:domainId', authMw.AllowIfAuthenticated, async (req, res,
         }
 
         for(const [key, value] of Object.entries(parsedVal)) {
-            if(!recordHeaders.includes(key)) {
+            if(!recordHeaders.includes(key) && key !== '_key') {
                 recordHeaders.push(capitalizeFirstLetter(key));
             }
 
diff --git a/views/dns.handlebars b/views/dns.handlebars
index e971383..7d8d082 100644
--- a/views/dns.handlebars
+++ b/views/dns.handlebars
@@ -17,8 +17,8 @@
 
             <!-- Edit / Delete options -->
             <td>
-                <a href="/dns/edit/{{../domain.id}}/{{@index}}"><img src="/img/Wrench.png" alt="Edit"></a>
-                <a href="/dns/delete/{{../domain.id}}/{{@index}}"><img src="/img/Cancel.png" alt="Delete"></a>
+                <a href="/dns/edit/{{this._key}}"><img src="/img/Wrench.png" alt="Edit"></a>
+                <a href="/dns/delete/{{this._key}}"><img src="/img/Cancel.png" alt="Delete"></a>
             </td>
         </tr>
         {{/each}}