diff --git a/src/components/modal/item/show.vue b/src/components/modal/item/show.vue
index 89e1b8e..5e0113e 100644
--- a/src/components/modal/item/show.vue
+++ b/src/components/modal/item/show.vue
@@ -182,15 +182,7 @@ export default {
                     "left=0,top=0,width=800,height=900,toolbar=0,scrollbars=0,status=0"
             );
 
-            WinPrint.document.write(`<!DOCTYPE html>
-            <html>
-            <head>
-                ${stylesHtml}
-            </head>
-            <body>
-                ${prtHtml}
-            </body>
-            </html>`);
+            WinPrint.document.write(`<!DOCTYPE html><html><head>${stylesHtml}</head><body>${prtHtml}</body></html>`);
 
             WinPrint.document.close();
             WinPrint.focus();
@@ -198,6 +190,7 @@ export default {
             WinPrint.close();
         },
         openLightbox(index) {
+            console.log(index, '00')
             this.lightboxIndex = index;
             this.showLightbox = false;
             this.$nextTick(() => {
diff --git a/src/views/Cycle/AddEdit.vue b/src/views/Cycle/AddEdit.vue
index 7cb8b2f..e7270ec 100644
--- a/src/views/Cycle/AddEdit.vue
+++ b/src/views/Cycle/AddEdit.vue
@@ -46,9 +46,9 @@
                     <v-flex xs12 sm6 md4 class="WM-FlexCenter WM-DuplicateInput" style="position: relative"
                             v-for="(label, key) in formData.labels" :key="key">
                         <div class="Inner">
-                            <v-icon class="fa fa-check mr-2 WM-Margin-B-8"></v-icon>
+                            <v-icon class="fa fa-check mr-2 WM-Margin-B-8"/>
                             <v-autocomplete
-                                    @keydown.enter.native.prevent="duplicateForm(key)"
+                                    @keydown.enter.native.prevent="handleEnterScan(key)"
                                     @change="duplicateForm(key)"
                                     :ref="`selectItem-${key}`"
                                     color="black"
@@ -108,7 +108,7 @@
 <script>
 import {ApiService} from "@/services";
 import {urls} from "@/config/urls";
-import {mapMutations} from "vuex";
+import toast from "@/services/global/toast.service";
 
 export default {
     metaInfo() {
@@ -135,9 +135,15 @@ export default {
     },
     created() {
         this.loadLabels();
-        console.log()
         if (this.$route.params.cycle) {
             this.load(this.$route.params.cycle);
+        }else {
+            this.$nextTick(() => {
+                const firstRef = this.$refs[`selectItem-0`];
+                if (firstRef && firstRef[0]) {
+                    firstRef[0].focus();
+                }
+            });
         }
     },
     methods: {
@@ -175,6 +181,29 @@ export default {
                 this.$router.push({name: "AllCycle"});
             }
         },
+        handleEnterScan(key) {
+            const inputRef = this.$refs[`selectItem-${key}`][0];
+            const searchText = inputRef.searchValue || inputRef.lazySearch;
+            const selectedItemId = this.formData.labels[key].id;
+            if (!selectedItemId) {
+                const foundItem = this.labels.find(i =>
+                        i.udi === searchText ||
+                        i.name === searchText ||
+                        i.id == searchText
+                );
+
+                if (foundItem) {
+                    this.formData.labels[key].id = foundItem.id;
+                    if (inputRef.isMenuActive) {
+                        console.log(inputRef.isMenuActive)
+                        inputRef.isMenuActive = false;
+                    }
+                    this.duplicateForm(key);
+                } else {
+                    toast.error('item is not in the list');
+                }
+            }
+        },
         duplicateForm() {
             this.formData.labels.push({name: "",});
             this.$nextTick( () => {
diff --git a/src/views/Cycle/List.vue b/src/views/Cycle/List.vue
index 4cf833c..b36a886 100644
--- a/src/views/Cycle/List.vue
+++ b/src/views/Cycle/List.vue
@@ -251,7 +251,6 @@ export default {
         async download() {
             const result = await ApiService.get(urls.exportCycles());
             if (result && result.status == 200) {
-                console.log(result)
                 window.open(result.download, '_blank');
             }
         },
diff --git a/src/views/Item/AddEdit.vue b/src/views/Item/AddEdit.vue
index b75c72a..89d4acd 100644
--- a/src/views/Item/AddEdit.vue
+++ b/src/views/Item/AddEdit.vue
@@ -76,7 +76,6 @@
 <script>
 import {ApiService} from "@/services";
 import {urls} from "@/config/urls";
-import {mapMutations} from 'vuex';
 import Dropzone from '@/components/core/Dropzone'
 
 export default {
diff --git a/src/views/Package/AddEdit.vue b/src/views/Package/AddEdit.vue
index 799bd93..f0e3594 100644
--- a/src/views/Package/AddEdit.vue
+++ b/src/views/Package/AddEdit.vue
@@ -42,7 +42,7 @@
                             style="position: relative" v-for="(item, key) in formData.items" :key="key">
                         <div class="Inner">
                             <v-autocomplete
-                                    @keydown.enter.native.prevent="duplicateForm(key)"
+                                    @keydown.enter.native.prevent="handleEnterScan(key)"
                                     @change="duplicateForm(key)"
                                     :ref="`selectItem-${key}`"
                                     class="py-3 pr-3"
@@ -115,7 +115,7 @@
 <script>
 import {ApiService} from "@/services";
 import {urls} from "@/config/urls";
-import {mapMutations} from "vuex";
+import toast from "@/services/global/toast.service";
 
 export default {
     metaInfo() {
@@ -152,8 +152,14 @@ export default {
         this.loadItems();
         if (this.$route.params.package) {
             this.load(this.$route.params.package);
+        }else {
+            this.$nextTick(() => {
+                const firstRef = this.$refs[`selectItem-0`];
+                if (firstRef && firstRef[0]) {
+                    firstRef[0].focus();
+                }
+            });
         }
-
     },
     methods: {
         customFilter(item, queryText) {
@@ -198,10 +204,32 @@ export default {
                 this.$router.push({name: "AllPackage"});
             }
         },
+        handleEnterScan(key) {
+            const inputRef = this.$refs[`selectItem-${key}`][0];
+            const searchText = inputRef.searchValue || inputRef.lazySearch;
+            const selectedItemId = this.formData.items[key].id;
+            if (!selectedItemId) {
+                const foundItem = this.items.find(i =>
+                        i.udi === searchText ||
+                        i.name === searchText ||
+                        i.id == searchText
+                );
 
+                if (foundItem) {
+                    this.formData.items[key].id = foundItem.id;
+                    if (inputRef.isMenuActive) {
+                        console.log(inputRef.isMenuActive)
+                        inputRef.isMenuActive = false;
+                    }
+                    this.duplicateForm(key);
+                } else {
+                    toast.error('item is not in the list');
+                }
+            }
+        },
         duplicateForm() {
             this.formData.items.push({name: "",});
-            this.$nextTick( () => {
+            this.$nextTick(() => {
                 const newIndex = this.formData.items.length - 1;
                 const ref = this.$refs[`selectItem-${newIndex}`];
                 if (ref && ref[0]) {