diff --git a/package.json b/package.json
index 78913114..9c60123c 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "cy:open": "CYPRESS_CACHE_FOLDER='node_modules/.cache/Cypress' yarn cypress open -C cypress/config/cypress.config.ts"
   },
   "dependencies": {
-    "@anzusystems/common-admin": "1.47.0-beta.102",
+    "@anzusystems/common-admin": "1.47.0-beta.103",
     "@mdi/font": "7.4.47",
     "@vuelidate/core": "^2.0.3",
     "@vuelidate/validators": "^2.0.4",
@@ -30,10 +30,10 @@
     "axios": "^1.7.8",
     "cropperjs": "^1.6.2",
     "jwt-decode": "^4.0.0",
-    "pinia": "^2.2.7",
+    "pinia": "^2.2.8",
     "rusha": "^0.8.14",
     "socket.io-client": "^4.8.1",
-    "sortablejs": "^1.15.5",
+    "sortablejs": "^1.15.6",
     "universal-cookie": "^7.2.2",
     "uuid": "^11.0.3",
     "vue": "3.5.13",
@@ -65,7 +65,7 @@
     "postcss-html": "^1.7.0",
     "prettier": "^3.4.1",
     "sass": "^1.81.0",
-    "stylelint": "^16.10.0",
+    "stylelint": "^16.11.0",
     "stylelint-config-recommended-vue": "^1.5.0",
     "stylelint-config-standard-scss": "^13.1.0",
     "typescript": "5.5.4",
diff --git a/src/locales/sk/system.json b/src/locales/sk/system.json
index 7316838c..5d269f06 100644
--- a/src/locales/sk/system.json
+++ b/src/locales/sk/system.json
@@ -51,7 +51,7 @@
     "podcasts": "Podcasty",
     "videoShows": "Video relácie",
     "extSystemLicenceSwitch": {
-      "filters": "filtre",
+      "filters": "Filtre",
       "filter": {
         "extSystemName": "Meno externého systému",
         "extSystemId": "ID externého systému",
diff --git a/src/views/coreDam/asset/components/toolbar/AssetToolbarExtSystemLicenceDialog.vue b/src/views/coreDam/asset/components/toolbar/AssetToolbarExtSystemLicenceDialog.vue
index 650712e1..0053a832 100644
--- a/src/views/coreDam/asset/components/toolbar/AssetToolbarExtSystemLicenceDialog.vue
+++ b/src/views/coreDam/asset/components/toolbar/AssetToolbarExtSystemLicenceDialog.vue
@@ -21,7 +21,7 @@ import {
   isUndefined,
   useAlerts,
   useDamConfigStore,
-  useValidate
+  useValidate,
 } from '@anzusystems/common-admin'
 import useVuelidate, { type ErrorObject } from '@vuelidate/core'
 import { storeToRefs } from 'pinia'
@@ -65,6 +65,7 @@ const selectedLicence = ref<null | IntegerId>(null)
 
 const selectedExtSystemSearch = ref<null | IntegerId>(null)
 const selectedLicenceSearch = ref<null | IntegerId>(null)
+const selectedLicenceSearchByExtId = ref<null | IntegerId>(null)
 
 const extSystemsItems = computed(() => {
   if (currentUser.value && currentUser.value.userToExtSystemsDto.length > 0) {
@@ -147,6 +148,7 @@ const onConfirm = async () => {
 }
 
 const onSelectedExtSystemSearchChange = (value: IntegerIdNullable | IntegerId[]) => {
+  selectedLicenceSearch.value = null
   if (isArray<IntegerIdNullable>(value) && value[0]) {
     selectedExtSystem.value = value[0]
     selectedLicence.value = null
@@ -166,6 +168,18 @@ const onSelectedLicenceSearchChange = (value: IntegerIdNullable | IntegerId[]) =
   if (isInt(value) || isNull(value)) selectedLicence.value = value
 }
 
+const onSelectedLicenceSearchByExtIdChange = (value: IntegerIdNullable | IntegerId[]) => {
+  if (isArray<IntegerIdNullable>(value) && value[0]) {
+    selectedLicence.value = value[0]
+    selectedLicenceSearch.value = value[0]
+    return
+  }
+  if (isInt(value) || isNull(value)) {
+    selectedLicence.value = value
+    selectedLicenceSearch.value = value
+  }
+}
+
 onMounted(async () => {
   selectedExtSystem.value = currentExtSystemId.value
   selectedLicence.value = currentAssetLicenceId.value
@@ -188,10 +202,10 @@ onMounted(async () => {
         <div class="mb-4 text-caption">
           {{ t('system.mainBar.extSystemLicenceSwitch.currentExtSystem') }}: {{ currentExtSystemId }} ({{
             extSystemName
-          }})<br>
+          }})<br />
           {{ t('system.mainBar.extSystemLicenceSwitch.currentLicence') }}: {{ currentAssetLicenceId }} ({{
             licenceName
-          }})<br>
+          }})<br />
         </div>
         <ASystemEntityScope
           :system="SYSTEM_CORE_DAM"
@@ -236,16 +250,16 @@ onMounted(async () => {
             </VCol>
             <VCol>
               <AssetLicenceByExtIdRemoteAutocomplete
-                v-model="selectedLicenceSearch"
+                v-model="selectedLicenceSearchByExtId"
                 :label="t('system.mainBar.extSystemLicenceSwitch.filter.licenceExtId')"
                 :ext-system-id="selectedExtSystem"
                 hide-details
                 data-cy="field-id-licence"
-                @update:model-value="onSelectedLicenceSearchChange"
+                @update:model-value="onSelectedLicenceSearchByExtIdChange"
               />
             </VCol>
           </VRow>
-          <div class="d-flex align-center w-100">
+          <div class="d-flex align-center w-100 mt-8">
             <div class="text-caption font-weight-bold">
               {{ t('system.mainBar.extSystemLicenceSwitch.changeToLicenceId') }}: <span class="text-error">*</span>
             </div>
diff --git a/src/views/coreDam/assetLicence/components/AssetLicenceByExtIdRemoteAutocomplete.vue b/src/views/coreDam/assetLicence/components/AssetLicenceByExtIdRemoteAutocomplete.vue
index 4e3a76ae..2e006afd 100644
--- a/src/views/coreDam/assetLicence/components/AssetLicenceByExtIdRemoteAutocomplete.vue
+++ b/src/views/coreDam/assetLicence/components/AssetLicenceByExtIdRemoteAutocomplete.vue
@@ -1,6 +1,14 @@
 <script lang="ts" setup>
-import type { IntegerId, IntegerIdNullable } from '@anzusystems/common-admin'
-import { AFormRemoteAutocomplete, cloneDeep, useDamAssetLicenceFilter } from '@anzusystems/common-admin'
+import {
+  AFormRemoteAutocomplete,
+  cloneDeep,
+  type FilterBag,
+  type IntegerId,
+  type IntegerIdNullable,
+  isString,
+  type Pagination,
+  useDamAssetLicenceFilter,
+} from '@anzusystems/common-admin'
 import { useAssetLicenceByExtIdSelectActions } from '@/views/coreDam/assetLicence/composables/assetLicenceActions'
 import { computed, watch } from 'vue'
 
@@ -42,6 +50,16 @@ const modelValueComputed = computed({
 
 const { fetchItems, fetchItemsByIds } = useAssetLicenceByExtIdSelectActions()
 
+/**
+ * Limit to fetch only when extId is set.
+ */
+const fetchItemsCustomized = async (pagination: Pagination, filterBag: FilterBag) => {
+  if (isString(filterBag.extId.model) && filterBag.extId.model.length > 0) {
+    return await fetchItems(pagination, filterBag)
+  }
+  return []
+}
+
 const innerFilter = useDamAssetLicenceFilter()
 
 const selectedExtSystemId = computed(() => {
@@ -69,7 +87,7 @@ watch(
     v-model="modelValueComputed"
     :required="required"
     :label="label"
-    :fetch-items="fetchItems"
+    :fetch-items="fetchItemsCustomized"
     :fetch-items-by-ids="fetchItemsByIds"
     :inner-filter="innerFilter"
     :multiple="multiple"
diff --git a/yarn.lock b/yarn.lock
index 9bcc1797..b9621149 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12,9 +12,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@anzusystems/common-admin@npm:1.47.0-beta.102":
-  version: 1.47.0-beta.102
-  resolution: "@anzusystems/common-admin@npm:1.47.0-beta.102"
+"@anzusystems/common-admin@npm:1.47.0-beta.103":
+  version: 1.47.0-beta.103
+  resolution: "@anzusystems/common-admin@npm:1.47.0-beta.103"
   peerDependencies:
     "@vuelidate/core": 2.0.3
     "@vuelidate/validators": 2.0.4
@@ -22,7 +22,7 @@ __metadata:
     "@vueuse/integrations": 12.0.0
     axios: 1.7.8
     dayjs: 1.11.13
-    pinia: 2.2.7
+    pinia: 2.2.8
     socket.io-client: 4.8.1
     unplugin: 1.16.0
     vue: 3.5.13
@@ -42,7 +42,7 @@ __metadata:
       optional: true
     vue-router:
       optional: true
-  checksum: 10/de8a04cfcfd6bd29bcfb378e4ed2a1abbd02e49133b5eec6bf72f9a04f94a9441315ca5f1a9eafdd649f0825e8e357f7c6a7f3d786a33bf758a5f5952c540741
+  checksum: 10/87d087fbfaa396248e6506ba570678ece52f7c90442c4950bf92300bbd11f5fca08c934c7e430bad6a69c28639cff3e0d7e0c3547591ce3d60ca5f930efd2a44
   languageName: node
   linkType: hard
 
@@ -161,38 +161,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^3.0.1":
-  version: 3.0.2
-  resolution: "@csstools/css-parser-algorithms@npm:3.0.2"
+"@csstools/css-parser-algorithms@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "@csstools/css-parser-algorithms@npm:3.0.4"
   peerDependencies:
-    "@csstools/css-tokenizer": ^3.0.2
-  checksum: 10/ecc8ad77304606e59ce5b1d34b97e879f2b3745fe8cf26649faceb881ee1d47183dd7d1c07778ac58ffac5991365c43eebc3a015db9f872b3a08f8f1c03240f5
+    "@csstools/css-tokenizer": ^3.0.3
+  checksum: 10/dfb6926218d9f8ba25d8b43ea46c03863c819481f8c55e4de4925780eaab9e6bcd6bead1d56b4ef82d09fcd9d69a7db2750fa9db08eece9470fd499dc76d0edb
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^3.0.1":
-  version: 3.0.2
-  resolution: "@csstools/css-tokenizer@npm:3.0.2"
-  checksum: 10/6453982ede998dbd8c222cdc5efa11375c1e7c9ad66c55b077ec23f2ecec1080aa0631818cdea191c36f0b8e1fd607408d13664a898299c2a594d93ef6fa62e9
+"@csstools/css-tokenizer@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "@csstools/css-tokenizer@npm:3.0.3"
+  checksum: 10/6baa3160e426e1f177b8f10d54ec7a4a596090f65a05f16d7e9e4da049962a404eabc5f885f4867093702c259cd4080ac92a438326e22dea015201b3e71f5bbb
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@csstools/media-query-list-parser@npm:3.0.1"
+"@csstools/media-query-list-parser@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "@csstools/media-query-list-parser@npm:4.0.2"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^3.0.1
-    "@csstools/css-tokenizer": ^3.0.1
-  checksum: 10/794344c67b126ad93d516ab3f01254d44cfa794c3401e34e8cc62ddc7fc13c9ab6c76cb517b643dbda47b57f2eb578c6a11c4a9a4b516d88e260a4016b64ce7f
+    "@csstools/css-parser-algorithms": ^3.0.4
+    "@csstools/css-tokenizer": ^3.0.3
+  checksum: 10/8aae6337d21255d34e4f6dc6df213566e35bb769fe131006ea4200b643773f3213f8ed0ab011cd85dbe3426766c408d0fe1d04d18e821add9ae7f29cda0a8b26
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@csstools/selector-specificity@npm:4.0.0"
+"@csstools/selector-specificity@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@csstools/selector-specificity@npm:5.0.0"
   peerDependencies:
-    postcss-selector-parser: ^6.1.0
-  checksum: 10/7076c1d8af0fba94f06718f87fba5bfea583f39089efa906ae38b5ecd6912d3d5865f7047a871ac524b1057e4c970622b2ade456b90d69fb9393902250057994
+    postcss-selector-parser: ^7.0.0
+  checksum: 10/8df1a01a1fa52b66c7ba0286e1c77d1faff45009876f09ddcac542a1c4bca9f34ee92a10acf056b8e7b7ac93679c1635496c6cdfd7d88dbaff2b6afd1eb823ec
   languageName: node
   linkType: hard
 
@@ -2102,7 +2102,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "adam-admin@workspace:."
   dependencies:
-    "@anzusystems/common-admin": "npm:1.47.0-beta.102"
+    "@anzusystems/common-admin": "npm:1.47.0-beta.103"
     "@cypress/grep": "npm:^4.1.0"
     "@intlify/unplugin-vue-i18n": "npm:^6.0.0"
     "@mdi/font": "npm:7.4.47"
@@ -2130,15 +2130,15 @@ __metadata:
     eslint-plugin-vue: "npm:^9.31.0"
     jwt-decode: "npm:^4.0.0"
     npm-run-all2: "npm:^7.0.1"
-    pinia: "npm:^2.2.7"
+    pinia: "npm:^2.2.8"
     postcss: "npm:^8.4.49"
     postcss-html: "npm:^1.7.0"
     prettier: "npm:^3.4.1"
     rusha: "npm:^0.8.14"
     sass: "npm:^1.81.0"
     socket.io-client: "npm:^4.8.1"
-    sortablejs: "npm:^1.15.5"
-    stylelint: "npm:^16.10.0"
+    sortablejs: "npm:^1.15.6"
+    stylelint: "npm:^16.11.0"
     stylelint-config-recommended-vue: "npm:^1.5.0"
     stylelint-config-standard-scss: "npm:^13.1.0"
     typescript: "npm:5.5.4"
@@ -2849,13 +2849,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-tree@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "css-tree@npm:3.0.0"
+"css-tree@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "css-tree@npm:3.0.1"
   dependencies:
-    mdn-data: "npm:2.10.0"
+    mdn-data: "npm:2.12.1"
     source-map-js: "npm:^1.0.1"
-  checksum: 10/ab56b8cd1953c3270e95b63540462037b48dc120c4d6f686eeb054bb99acf3bb0a40bff306bb4fc2e077f8d95f5b518067205d577029ab84ba279d75867c4f37
+  checksum: 10/877a77669739f94e57589c94c1ea8b7b105e373d4855e94375638b411e2913337a900120dc45c13511d0f7c339b73cecf8dc61ce28034984dbf75993dac756b0
   languageName: node
   linkType: hard
 
@@ -4873,10 +4873,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"known-css-properties@npm:^0.34.0":
-  version: 0.34.0
-  resolution: "known-css-properties@npm:0.34.0"
-  checksum: 10/0e93e83f84537e89b9dc56c16aff511ed9f24128fe509c3f601ce495eb10bf6678e2f4ff521f6b53feabc7bd18088e43efb31aae4cb771da831ef1408c23211a
+"known-css-properties@npm:^0.35.0":
+  version: 0.35.0
+  resolution: "known-css-properties@npm:0.35.0"
+  checksum: 10/a6f3f271a94913c72b29e59bd1e96836b0b5427c5dd9969f4673026cd39f7f441b5e8d0b704b0a830c43d745a5f7ca98d41d99961dc4c008ebf756545bada85c
   languageName: node
   linkType: hard
 
@@ -5088,10 +5088,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mdn-data@npm:2.10.0":
-  version: 2.10.0
-  resolution: "mdn-data@npm:2.10.0"
-  checksum: 10/41b6dde00681dc8a45a907836b10735a9bef1731c5d9269dd05e6c25749ec5d0383e4055b71acd8b1905fcb428e4c43235a2601558df361ae42c3e4c6a9aa6ed
+"mdn-data@npm:2.12.1":
+  version: 2.12.1
+  resolution: "mdn-data@npm:2.12.1"
+  checksum: 10/7928cfc828b0ebbde84ce56be2e3aa729c1770bfbc83ef1dadf5f98346ab003ca0a1b3339076115d77acf623719efa3f9f2be8c69f73c453fe887cb982bfa625
   languageName: node
   linkType: hard
 
@@ -5741,13 +5741,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picocolors@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "picocolors@npm:1.0.1"
-  checksum: 10/fa68166d1f56009fc02a34cdfd112b0dd3cf1ef57667ac57281f714065558c01828cdf4f18600ad6851cbe0093952ed0660b1e0156bddf2184b6aaf5817553a5
-  languageName: node
-  linkType: hard
-
 "picocolors@npm:^1.1.0":
   version: 1.1.0
   resolution: "picocolors@npm:1.1.0"
@@ -5792,9 +5785,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pinia@npm:^2.2.7":
-  version: 2.2.7
-  resolution: "pinia@npm:2.2.7"
+"pinia@npm:^2.2.8":
+  version: 2.2.8
+  resolution: "pinia@npm:2.2.8"
   dependencies:
     "@vue/devtools-api": "npm:^6.6.3"
     vue-demi: "npm:^0.14.10"
@@ -5807,7 +5800,7 @@ __metadata:
       optional: true
     typescript:
       optional: true
-  checksum: 10/6ffb40b4a40477e4e04785528aa0ccd560266f5becb3eceaae527b7a1a4b4685b180dbf37ebeb87b40128adc478f6af5e38dc92cc46e11a1d81d0c7b68b1df1b
+  checksum: 10/c2d534e46442d5033604a37fe83a34068c89eab021962b27330a394b69afddc77abdd743fc9f9a40ea0103e46d210f78099665a0a1aee68b93a6b85dda35202b
   languageName: node
   linkType: hard
 
@@ -5902,13 +5895,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.1.2":
-  version: 6.1.2
-  resolution: "postcss-selector-parser@npm:6.1.2"
+"postcss-selector-parser@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-selector-parser@npm:7.0.0"
   dependencies:
     cssesc: "npm:^3.0.0"
     util-deprecate: "npm:^1.0.2"
-  checksum: 10/190034c94d809c115cd2f32ee6aade84e933450a43ec3899c3e78e7d7b33efd3a2a975bb45d7700b6c5b196c06a7d9acf3f1ba6f1d87032d9675a29d8bca1dd3
+  checksum: 10/0e92be7281e2b440a8be8cf207de40a24ca7bc765577916499614d5a47827a3e658206728cc559db96803e554270516104aad919a04f91bfa8914ccef1ba14ca
   languageName: node
   linkType: hard
 
@@ -6545,10 +6538,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sortablejs@npm:^1.15.5":
-  version: 1.15.5
-  resolution: "sortablejs@npm:1.15.5"
-  checksum: 10/a71b396d68a0eab728fc638853b4202edcfc7385d69bdcd2df9b0072545ba0b2d06156619139fb45503a893636c609c9a6e8f715494eb93432c01a3bdc5edf26
+"sortablejs@npm:^1.15.6":
+  version: 1.15.6
+  resolution: "sortablejs@npm:1.15.6"
+  checksum: 10/3179071352662e6cff20d7d10792a934fc892a83a01ae09c7e604d2dd51daaf07283b00a8f2b13025f27959ff68a1469959bc94ef2a7049723d4c381a368a5ac
   languageName: node
   linkType: hard
 
@@ -6745,20 +6738,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylelint@npm:^16.10.0":
-  version: 16.10.0
-  resolution: "stylelint@npm:16.10.0"
+"stylelint@npm:^16.11.0":
+  version: 16.11.0
+  resolution: "stylelint@npm:16.11.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^3.0.1"
-    "@csstools/css-tokenizer": "npm:^3.0.1"
-    "@csstools/media-query-list-parser": "npm:^3.0.1"
-    "@csstools/selector-specificity": "npm:^4.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.4"
+    "@csstools/css-tokenizer": "npm:^3.0.3"
+    "@csstools/media-query-list-parser": "npm:^4.0.2"
+    "@csstools/selector-specificity": "npm:^5.0.0"
     "@dual-bundle/import-meta-resolve": "npm:^4.1.0"
     balanced-match: "npm:^2.0.0"
     colord: "npm:^2.9.3"
     cosmiconfig: "npm:^9.0.0"
     css-functions-list: "npm:^3.2.3"
-    css-tree: "npm:^3.0.0"
+    css-tree: "npm:^3.0.1"
     debug: "npm:^4.3.7"
     fast-glob: "npm:^3.3.2"
     fastest-levenshtein: "npm:^1.0.16"
@@ -6770,16 +6763,16 @@ __metadata:
     ignore: "npm:^6.0.2"
     imurmurhash: "npm:^0.1.4"
     is-plain-object: "npm:^5.0.0"
-    known-css-properties: "npm:^0.34.0"
+    known-css-properties: "npm:^0.35.0"
     mathml-tag-names: "npm:^2.1.3"
     meow: "npm:^13.2.0"
     micromatch: "npm:^4.0.8"
     normalize-path: "npm:^3.0.0"
-    picocolors: "npm:^1.0.1"
-    postcss: "npm:^8.4.47"
+    picocolors: "npm:^1.1.1"
+    postcss: "npm:^8.4.49"
     postcss-resolve-nested-selector: "npm:^0.1.6"
     postcss-safe-parser: "npm:^7.0.1"
-    postcss-selector-parser: "npm:^6.1.2"
+    postcss-selector-parser: "npm:^7.0.0"
     postcss-value-parser: "npm:^4.2.0"
     resolve-from: "npm:^5.0.0"
     string-width: "npm:^4.2.3"
@@ -6789,7 +6782,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10/2bc1627e2681414d9c61a96e8298ca7697ce8bc78bb9ffe1c3e370e064ca81cd4d131493a3f315334195b1f039ff99ea0c900e264ca4516c93ee5c36d2e4490d
+  checksum: 10/5865450e8729fcd53f85ded56e8f7fa8e0fe7a35eb8339ebc9d3b6735f48bbf9199fb6c751df07c5ee8389977d6af339501c77e57a0a4b5c621ee34360ac2f60
   languageName: node
   linkType: hard