diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/cargsoft-creditor-search.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/cargsoft-creditor-search.xhtml
index 25c419d..d993ba3 100644
--- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/cargsoft-creditor-search.xhtml
+++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/cargsoft-creditor-search.xhtml
@@ -21,7 +21,7 @@
 		https://dzone.com/articles/execute-a-jsf-ajax-request-by-just-a-function-call
 		https://www.w3schools.com/howto/howto_js_autocomplete.asp
 	 -->
-  	<h:commandScript name="cargosoftSearch" action="#{cargosoftController.searchCreditor(searchmode)}" 
+  	<h:commandScript name="cargosoftCdtrSearch" action="#{cargosoftController.searchCreditor(searchmode)}" 
   			 render="autocomplete-resultlist-cargosoft" onevent="autocompleteShowResult" />
   	
 	
@@ -35,7 +35,7 @@
 				var creditorField= $("input[data-item='cdtr.number']");
 				$(creditorField).each(function() {
 					$(this).addClass("imixs-ml");
-					autocompleteInitInput(this,cargosoftSearch,'autocomplete-resultlist-cargosoft',selectCdtrCallback);
+					autocompleteInitInput(this,cargosoftCdtrSearch,'autocomplete-resultlist-cargosoft',selectCdtrCallback);
 				});
 				// add cargsoft label if available
 				var cdtrName="#{workflowController.workitem.item['cdtr.name.cargosoft']}";
@@ -115,9 +115,6 @@
 			</div>
 		</ui:repeat>
 	</h:panelGroup>
-						
-			
-
 				
 </ui:composition>
 
diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/cargsoft-debitor-search.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/cargsoft-debitor-search.xhtml
index ed35c28..ae50437 100644
--- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/cargsoft-debitor-search.xhtml
+++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/cargsoft-debitor-search.xhtml
@@ -21,7 +21,7 @@
 		https://dzone.com/articles/execute-a-jsf-ajax-request-by-just-a-function-call
 		https://www.w3schools.com/howto/howto_js_autocomplete.asp
 	 -->
-  	<h:commandScript name="cargosoftSearch" action="#{cargosoftController.searchDebitor()}" 
+  	<h:commandScript name="cargosoftDbtrSearch" action="#{cargosoftController.searchDebitor()}" 
   			 render="autocomplete-resultlist-cargosoft" onevent="autocompleteShowResult" />
   	<h:commandScript name="updateDbtrNumber" action="#{opListController.updateDbtrNumber()}" 
   			 render="#{opListContainer.clientId}" onevent="ajaxUpdateInvoiceSelection" />
@@ -35,7 +35,8 @@
 				var creditorField= $("input[data-item='dbtr.number']");
 				$(creditorField).each(function() {
 					$(this).addClass("imixs-ml");
-					autocompleteInitInput(this,cargosoftSearch,'autocomplete-resultlist-cargosoft',selectDbtrCallback);
+					// set callback function...
+					autocompleteInitInput(this,cargosoftDbtrSearch,'autocomplete-resultlist-cargosoft',selectDbtrCallback);
 				});
 				// add cargsoft label if available
 				var dbtrName="#{workflowController.workitem.item['dbtr.name']}";