diff --git a/django/static/admin/js/autocomplete.js b/django/static/admin/js/autocomplete.js
index a7cc934..9343219 100644
--- a/django/static/admin/js/autocomplete.js
+++ b/django/static/admin/js/autocomplete.js
@@ -7,12 +7,13 @@
             $(element).select2({
                 ajax: {
                     data: (params)=>{
+                        var field_name = element.dataset.fieldName
                         var out = {
                             term: params.term,
                             page: params.page,
                             app_label: element.dataset.appLabel,
                             model_name: element.dataset.modelName,
-                            field_name: element.dataset.fieldName
+                            field_name: field_name
                         };
                         if (element.dataset.hasOwnProperty('linkedfields')) {
                             var linkedfields = JSON.parse(element.dataset.linkedfields)
@@ -21,7 +22,8 @@
                             for (var i in linkedfields) {
                                 if (linkedfields.hasOwnProperty(i)) {
                                     var remote_field = linkedfields[i];
-                                    var remote_id = element.dataset.select2Id.split('-' + element.dataset.fieldName)[0] + '-' + remote_field;
+                                    var field_id = element.dataset.select2Id;
+                                    var remote_id = field_id.slice(0,field_id.length-field_name.length)+remote_field;
                                     var value = document.querySelectorAll('[data-select2-id=' + remote_id +'].admin-autocomplete')[0].value;
                                     if (value !== '') {
                                         //console.log(field + '=' + value);