diff --git a/src/org/openbravo/retail/efstaintegration/austria/terminal/OrganizationSearchKey.java b/src/org/openbravo/retail/efstaintegration/austria/terminal/OrganizationSearchKey.java
new file mode 100644
index 0000000000000000000000000000000000000000..097805161fea000b4a8e75b940017a36421a7b86
--- /dev/null
+++ b/src/org/openbravo/retail/efstaintegration/austria/terminal/OrganizationSearchKey.java
@@ -0,0 +1,30 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2021 Openbravo S.L.U.
+ * Licensed under the Openbravo Commercial License version 1.0
+ * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
+ * or in the legal folder of this module distribution.
+ ************************************************************************************
+ */
+package org.openbravo.retail.efstaintegration.austria.terminal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.openbravo.client.kernel.ComponentProvider.Qualifier;
+import org.openbravo.mobile.core.model.HQLProperty;
+import org.openbravo.mobile.core.model.ModelExtension;
+import org.openbravo.retail.posterminal.term.Terminal;
+
+@Qualifier(Terminal.terminalPropertyExtension)
+public class OrganizationSearchKey extends ModelExtension {
+
+  @Override
+  public List<HQLProperty> getHQLProperties(final Object params) {
+
+    final ArrayList<HQLProperty> list = new ArrayList<HQLProperty>();
+    list.add(new HQLProperty("org.searchKey", "organizationSearchKey"));
+
+    return list;
+  }
+}
diff --git a/web/org.openbravo.retail.efstaintegration.austria/source/hooks/efCreateRequesHook.js b/web/org.openbravo.retail.efstaintegration.austria/source/hooks/efCreateRequesHook.js
index 6a54ef1cbd877f84498d42002f83a4140e1ac538..06df47ae14d397f6e26dae41e5158e5d66b1dcd9 100644
--- a/web/org.openbravo.retail.efstaintegration.austria/source/hooks/efCreateRequesHook.js
+++ b/web/org.openbravo.retail.efstaintegration.austria/source/hooks/efCreateRequesHook.js
@@ -142,7 +142,7 @@
             children: [
               {
                 name: 'ESR',
-                TL: OB.MobileApp.model.get('terminal').organization$_identifier,
+                TL: OB.MobileApp.model.get('terminal').organizationSearchKey,
                 TT: OB.MobileApp.model.get('terminal').searchKey,
                 D:
                   receipt.get('orderDate') instanceof Date