diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
index e8d65c9bb9..4b6609ef4e 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
@@ -1935,7 +1935,9 @@
                 </div>
                 <div class="col-md-8 text-right mt-2 mt-md-0">
                   <button id="modalFrame-cancel" type="button" class="btn btn-danger mr-0 ml-1" data-dismiss="modal"></button>
-                  <button id="modalFrame-send" type="button" class="btn btn-primary mr-0 ml-1"></button>
+                  <button id="modalFrame-send" type="button" class="btn btn-primary mr-0 ml-1">
+                    <xed:output i18n="button.select"/>
+                  </button>
                 </div>
               </div>
             </div>
diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/relatedItem-modal.js b/mir-module/src/main/resources/META-INF/resources/js/mir/relatedItem-modal.js
index 893e2555c6..50fabf2553 100644
--- a/mir-module/src/main/resources/META-INF/resources/js/mir/relatedItem-modal.js
+++ b/mir-module/src/main/resources/META-INF/resources/js/mir/relatedItem-modal.js
@@ -76,6 +76,10 @@ $(document).ready(function() {
     var input = button.next().next("input");
     var sortType = "";
     let fq = button.data("fq");
+    //if no id is given set fq empty
+    if(fq == "-id:") {
+      fq = "";
+    }
 
     //load genre classification
     loadGenres(initContent);
@@ -99,7 +103,7 @@ $(document).ready(function() {
     function initBody() {
       $("#modalFrame-title").text(button.val());
       $("#modalFrame-cancel").text($("button[name='_xed_submit_cancel']").text());
-      $("#modalFrame-send").text("Auswählen").attr("disabled", "").removeAttr("style");
+      $("#modalFrame-send").attr("disabled", "").removeAttr("style");
       // TODO: check if you can remove HTML from js code (e.g. by a js template)
       $("#modalFrame-body").append("<div id='main_left_content' class='list-group col-md-4' />");
       $("#modalFrame-body").append("<div id='main_right_content' class='list-group col-md-8' />");
@@ -108,9 +112,14 @@ $(document).ready(function() {
       $("#main_right_content").css("padding-left", "10px");
       //create pagination
       $("#modalFrame-body").append("<div class='col-12 mt-2'><nav style='clear: both'><ul class='modal-frame-pagination pagination justify-content-center'><li id='first' class='page-item previous disabled'><a href='#' class='page-link' data='0'>First</a></li><li id='previous' class='page-item previous disabled'><a href='#' class='page-link'>Previous</a></li><li class='page-item next disabled'><a href='#' class='page-link'>Next</a></li></ul></nav></div>");
-      $(".already-linked").after("<div class='col-md-4 type-select'><select class='form-control'><option value=''>Ohne Eingrenzung nach Typ:</option></select></div>");
+
+      if($(".type-select").length == 0) {
+        $(".already-linked").after("<div class='col-md-4 type-select'><select class='form-control'><option value=''>Ohne Eingrenzung nach Typ:</option></select></div>");
+      }
+
       $("li a").css("cursor", "pointer");
       $("#modal-searchInput").removeAttr("hidden");
+      $("#modal-searchInput button span").removeAttr("style");
       $("#modal-searchInput > input").attr("autocomplete", "off");
       $("#modalFrame").modal("show");
     }
@@ -289,7 +298,7 @@ $(document).ready(function() {
               dataType = "xml";
               break;
         case "select":
-              url = "servlets/solr/select?fq=" + fq + "q=" + qry + "&fq=objectType%3A\"mods\"&start=0&rows=10&XSL.Style=xml";
+              url = "servlets/solr/select?fq=" + fq + "&q=" + qry + "&fq=objectType%3A\"mods\"&start=0&rows=10&XSL.Style=xml";
               dataType = "xml";
               break;
         case "receive":
diff --git a/mir-module/src/main/resources/config/mir/messages_de.properties b/mir-module/src/main/resources/config/mir/messages_de.properties
index 39e470603e..66b3b81b92 100644
--- a/mir-module/src/main/resources/config/mir/messages_de.properties
+++ b/mir-module/src/main/resources/config/mir/messages_de.properties
@@ -36,6 +36,7 @@ button.loading         = Lade...
 button.save            = Speichern
 button.saveandredirect = Speichern und hochladen...
 button.search          = Suchen...
+button.select          = Ausw\u00E4hlen
 button.selectPerson    = Person ausw\u00E4hlen
 
 component.mods.metaData.dictionary.identifier.hdl       = Handle
diff --git a/mir-module/src/main/resources/config/mir/messages_en.properties b/mir-module/src/main/resources/config/mir/messages_en.properties
index 95dbe83e20..3e78c44add 100644
--- a/mir-module/src/main/resources/config/mir/messages_en.properties
+++ b/mir-module/src/main/resources/config/mir/messages_en.properties
@@ -33,6 +33,7 @@ button.loading         = Loading...
 button.save            = Save
 button.saveandredirect = Save and upload ...
 button.search          = Search...
+button.select          = Select
 button.selectPerson    = Select person
 
 component.mods.metaData.dictionary.identifier.hdl       = Handle