diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py
index 940ae939a..167ab8943 100644
--- a/netbox/circuits/forms.py
+++ b/netbox/circuits/forms.py
@@ -183,7 +183,7 @@ class CircuitTerminationForm(BootstrapMixin, forms.ModelForm):
         label='Device',
         widget=Livesearch(
             query_key='q',
-            query_url='dcim-api:device_list',
+            query_url='dcim-api:device-list',
             field_to_update='device'
         )
     )
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 8f3e73e04..f6f3eeeac 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -929,7 +929,7 @@ class ConsolePortConnectionForm(BootstrapMixin, forms.ModelForm):
         label='Console Server',
         widget=Livesearch(
             query_key='q',
-            query_url='dcim-api:device_list',
+            query_url='dcim-api:device-list',
             field_to_update='console_server',
         )
     )
@@ -1030,7 +1030,7 @@ class ConsoleServerPortConnectionForm(BootstrapMixin, forms.Form):
         label='Device',
         widget=Livesearch(
             query_key='q',
-            query_url='dcim-api:device_list',
+            query_url='dcim-api:device-list',
             field_to_update='device'
         )
     )
@@ -1197,7 +1197,7 @@ class PowerPortConnectionForm(BootstrapMixin, forms.ModelForm):
         label='PDU',
         widget=Livesearch(
             query_key='q',
-            query_url='dcim-api:device_list',
+            query_url='dcim-api:device-list',
             field_to_update='pdu'
         )
     )
@@ -1296,7 +1296,7 @@ class PowerOutletConnectionForm(BootstrapMixin, forms.Form):
         label='Device',
         widget=Livesearch(
             query_key='q',
-            query_url='dcim-api:device_list',
+            query_url='dcim-api:device-list',
             field_to_update='device'
         )
     )
@@ -1459,7 +1459,7 @@ class InterfaceConnectionForm(BootstrapMixin, forms.ModelForm):
         label='Device',
         widget=Livesearch(
             query_key='q',
-            query_url='dcim-api:device_list',
+            query_url='dcim-api:device-list',
             field_to_update='device_b'
         )
     )
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index 72b73208c..ca89f0cc6 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -404,7 +404,7 @@ class IPAddressAssignForm(BootstrapMixin, forms.Form):
         label='Device',
         widget=Livesearch(
             query_key='q',
-            query_url='dcim-api:device_list',
+            query_url='dcim-api:device-list',
             field_to_update='device'
         )
     )
diff --git a/netbox/project-static/js/livesearch.js b/netbox/project-static/js/livesearch.js
index 919fccf3b..f387372b4 100644
--- a/netbox/project-static/js/livesearch.js
+++ b/netbox/project-static/js/livesearch.js
@@ -27,7 +27,7 @@ $(document).ready(function() {
                 data: search_key + '=' + request.term,
                 success: function(data) {
                     var choices = [];
-                    $.each(data, function (index, choice) {
+                    $.each(data.results, function (index, choice) {
                         choices.push({
                             value: choice.id,
                             label: choice[label]