diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index 450e5a46c..d3fdfb306 100644
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -125,9 +125,7 @@
                 </tr>
             </table>
         </div>
-        {% with circuit.get_custom_fields as custom_fields %}
-            {% include 'inc/custom_fields_panel.html' %}
-        {% endwith %}
+        {% include 'inc/custom_fields_panel.html' with custom_fields=circuit.get_custom_fields %}
         {% include 'extras/inc/tags_panel.html' with tags=circuit.tags.all url='circuits:circuit_list' %}
         <div class="panel panel-default">
             <div class="panel-heading">
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index d91442728..56b5322d8 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -123,9 +123,7 @@
                 </tr>
             </table>
         </div>
-        {% with provider.get_custom_fields as custom_fields %}
-            {% include 'inc/custom_fields_panel.html' %}
-        {% endwith %}
+        {% include 'inc/custom_fields_panel.html' with custom_fields=provider.get_custom_fields %}
         {% include 'extras/inc/tags_panel.html' with tags=provider.tags.all url='circuits:provider_list' %}
         <div class="panel panel-default">
             <div class="panel-heading">
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index ac390256e..623efa9c4 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -282,9 +282,7 @@
                     {% endif %}
                 </table>
             </div>
-            {% with device.get_custom_fields as custom_fields %}
-                {% include 'inc/custom_fields_panel.html' %}
-            {% endwith %}
+            {% include 'inc/custom_fields_panel.html' with custom_fields=device.get_custom_fields %}
             {% include 'extras/inc/tags_panel.html' with tags=device.tags.all url='dcim:device_list' %}
             <div class="panel panel-default">
                 <div class="panel-heading">
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index 31004f314..26d9077f6 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -158,9 +158,7 @@
                 </tr>
             </table>
         </div>
-        {% with devicetype.get_custom_fields as custom_fields %}
-            {% include 'inc/custom_fields_panel.html' %}
-        {% endwith %}
+        {% include 'inc/custom_fields_panel.html' with custom_fields=devicetype.get_custom_fields %}
         {% include 'extras/inc/tags_panel.html' with tags=devicetype.tags.all url='dcim:devicetype_list' %}
         <div class="panel panel-default">
             <div class="panel-heading">
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 48b5e078e..bfb512d03 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -158,9 +158,7 @@
                 </tr>
             </table>
         </div>
-        {% with rack.get_custom_fields as custom_fields %}
-            {% include 'inc/custom_fields_panel.html' %}
-        {% endwith %}
+        {% include 'inc/custom_fields_panel.html' with custom_fields=rack.get_custom_fields %}
         {% include 'extras/inc/tags_panel.html' with tags=rack.tags.all url='dcim:rack_list' %}
         <div class="panel panel-default">
             <div class="panel-heading">
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index d82093f56..7a339401d 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -219,9 +219,7 @@
                 </tr>
             </table>
         </div>
-        {% with site.get_custom_fields as custom_fields %}
-            {% include 'inc/custom_fields_panel.html' %}
-        {% endwith %}
+        {% include 'inc/custom_fields_panel.html' with custom_fields=site.get_custom_fields %}
         {% include 'extras/inc/tags_panel.html' with tags=site.tags.all url='dcim:site_list' %}
         <div class="panel panel-default">
             <div class="panel-heading">
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index 1c6f29694..ace3d87c5 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -97,9 +97,7 @@
         </div>
     </div>
     <div class="col-md-6">
-        {% with aggregate.get_custom_fields as custom_fields %}
-            {% include 'inc/custom_fields_panel.html' %}
-        {% endwith %}
+        {% include 'inc/custom_fields_panel.html' with custom_fields=aggregate.get_custom_fields %}
         {% include 'extras/inc/tags_panel.html' with tags=aggregate.tags.all url='ipam:aggregate_list' %}
     </div>
 </div>
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index e4f41042a..27f1e96ef 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -147,9 +147,7 @@
                 </tr>
             </table>
         </div>
-        {% with ipaddress.get_custom_fields as custom_fields %}
-            {% include 'inc/custom_fields_panel.html' %}
-        {% endwith %}
+        {% include 'inc/custom_fields_panel.html' with custom_fields=ipaddress.get_custom_fields %}
         {% include 'extras/inc/tags_panel.html' with tags=ipaddress.tags.all url='ipam:ipaddress_list' %}
 	</div>
 	<div class="col-md-8">
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html
index 43f59dd80..3a35336a0 100644
--- a/netbox/templates/ipam/prefix.html
+++ b/netbox/templates/ipam/prefix.html
@@ -191,9 +191,7 @@
                     </tr>
                 </table>
             </div>
-            {% with prefix.get_custom_fields as custom_fields %}
-                {% include 'inc/custom_fields_panel.html' %}
-            {% endwith %}
+            {% include 'inc/custom_fields_panel.html' with custom_fields=prefix.get_custom_fields %}
             {% include 'extras/inc/tags_panel.html' with tags=prefix.tags.all url='ipam:prefix_list' %}
         </div>
         <div class="col-md-7">
diff --git a/netbox/templates/ipam/service.html b/netbox/templates/ipam/service.html
index c53c6124a..0407cee87 100644
--- a/netbox/templates/ipam/service.html
+++ b/netbox/templates/ipam/service.html
@@ -80,9 +80,7 @@
                 </tr>
 		    </table>
         </div>
-        {% with service.get_custom_fields as custom_fields %}
-            {% include 'inc/custom_fields_panel.html' %}
-        {% endwith %}
+        {% include 'inc/custom_fields_panel.html' with custom_fields=service.get_custom_fields %}
 	</div>
 </div>
 {% endblock %}
diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html
index 44c4e318a..9029ee5d9 100644
--- a/netbox/templates/ipam/vlan.html
+++ b/netbox/templates/ipam/vlan.html
@@ -139,9 +139,7 @@
                     </tr>
                 </table>
             </div>
-            {% with vlan.get_custom_fields as custom_fields %}
-                {% include 'inc/custom_fields_panel.html' %}
-            {% endwith %}
+            {% include 'inc/custom_fields_panel.html' with custom_fields=vlan.get_custom_fields %}
             {% include 'extras/inc/tags_panel.html' with tags=vlan.tags.all url='ipam:vlan_list' %}
         </div>
         <div class="col-md-6">
diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html
index 51414a8f5..d577c4ed0 100644
--- a/netbox/templates/ipam/vrf.html
+++ b/netbox/templates/ipam/vrf.html
@@ -92,9 +92,7 @@
                 </tr>
 		    </table>
         </div>
-        {% with vrf.get_custom_fields as custom_fields %}
-            {% include 'inc/custom_fields_panel.html' %}
-        {% endwith %}
+        {% include 'inc/custom_fields_panel.html' with custom_fields=vrf.get_custom_fields %}
         {% include 'extras/inc/tags_panel.html' with tags=vrf.tags.all url='ipam:vrf_list' %}
 	</div>
 	<div class="col-md-6">
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html
index c97044742..bf92a16c0 100644
--- a/netbox/templates/tenancy/tenant.html
+++ b/netbox/templates/tenancy/tenant.html
@@ -81,9 +81,7 @@
                 </tr>
             </table>
         </div>
-        {% with tenant.get_custom_fields as custom_fields %}
-            {% include 'inc/custom_fields_panel.html' %}
-        {% endwith %}
+        {% include 'inc/custom_fields_panel.html' with custom_fields=tenant.get_custom_fields %}
         {% include 'extras/inc/tags_panel.html' with tags=tenant.tags.all url='tenancy:tenant_list' %}
         <div class="panel panel-default">
             <div class="panel-heading">