diff --git a/Step.Utils/languages/IT.xml b/Step.Utils/languages/IT.xml
index cfb8efa1..0cb7380f 100644
--- a/Step.Utils/languages/IT.xml
+++ b/Step.Utils/languages/IT.xml
@@ -181,7 +181,8 @@
   <tooling_childtoolsfamily_skill_tools>Utensile %d</tooling_childtoolsfamily_skill_tools>  
   <tooling_childtoolsfamily_boxright_editlabel>Modifica utensile %d della famiglia %s</tooling_childtoolsfamily_boxright_editlabel>
   <siemens_tooling_childtoolsfamily_boxright_editlabel>Modifica utensile %d del gruppo %s</siemens_tooling_childtoolsfamily_boxright_editlabel>
-  <tooling_equipment_search_placeholder>Cerca un utensile per nome</tooling_equipment_search_placeholder>
+  <tooling_equipment_search_placeholder>Cerca un utensile per id</tooling_equipment_search_placeholder>
+  <siemens_tooling_equipment_search_placeholder>Cerca un utensile per nome</siemens_tooling_equipment_search_placeholder>
   <tooling_shank_search_placeholder>Cerca un colodo per Id</tooling_shank_search_placeholder>
   <siemens_tooling_shank_search_placeholder>Cerca un Multitool per nome</siemens_tooling_shank_search_placeholder>
   <tooling_magpos_search_placeholder>Cerca una manina per Id</tooling_magpos_search_placeholder>
diff --git a/Step.Utils/languages/en.xml b/Step.Utils/languages/en.xml
index a0af09af..5c478817 100644
--- a/Step.Utils/languages/en.xml
+++ b/Step.Utils/languages/en.xml
@@ -180,7 +180,8 @@
   <tooling_childtoolsfamily_skill_tools>Tool no. %d</tooling_childtoolsfamily_skill_tools>  
   <tooling_childtoolsfamily_boxright_editlabel>Edit Tool no. %d of family: %s</tooling_childtoolsfamily_boxright_editlabel>
   <siemens_tooling_childtoolsfamily_boxright_editlabel>Edit Tool no. %d of group: %s</siemens_tooling_childtoolsfamily_boxright_editlabel>
-  <tooling_equipment_search_placeholder>Find a tool by name</tooling_equipment_search_placeholder>
+  <tooling_equipment_search_placeholder>Find a tool by id</tooling_equipment_search_placeholder>
+  <siemens_tooling_equipment_search_placeholder>Find a tool by name</siemens_tooling_equipment_search_placeholder>
   <tooling_shank_search_placeholder>Find a shank by Id</tooling_shank_search_placeholder>
   <siemens_tooling_shank_search_placeholder>Find a Multitool by name</siemens_tooling_shank_search_placeholder>
   <tooling_magpos_search_placeholder>Find a mag.position by Id</tooling_magpos_search_placeholder>
diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue
index 66fb6a2f..6d7463b7 100644
--- a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue
+++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue
@@ -62,7 +62,7 @@
                         </detail-card>
                       </div>
                     <div ref="squarecontainer" class="square-container-fixed">
-                        <div class="square-container single" v-if="magazineType==0">
+                        <div class="square-container single" v-if="magazineType!=1 && magazineType!=2">
                             <div class="linesquare">
                                 <div class="square empty"
                                     v-for="(pos) in positions" :key="pos.positionId"
@@ -159,7 +159,7 @@
                         </detail-card>
                       </div>
                     <div ref="squarecontainer" class="square-container-fixed">
-                        <div class="square-container single" v-if="magazineType==0">
+                        <div class="square-container single" v-if="magazineType!=1 && magazineType!=2">
                             <div class="linesquare">
                                 <div class="square empty"
                                     v-for="(pos) in ncPositions" :key="pos.positionId"
diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts
index b1f35a10..2b5362eb 100644
--- a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts
+++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts
@@ -27,12 +27,17 @@ export default class toolingEquipment extends Vue {
     return (this.$store.state as AppModel).tooling.familyOptionActive;
   }
 
+  public get multitoolOptionActive(): boolean {
+    return (this.$store.state as AppModel).tooling.multitoolOptionActive;
+  }
+
   public get offsetOptionActive(): boolean {
     return (this.$store.state as AppModel).tooling.offsetOptionActive;
   }
 
   public get tools(): server.Tool[] { return (this.$store.state as AppModel).tooling.tools; }
-  public get ncTools(): server.ToolNc[] { return (this.$store.state as AppModel).tooling.ncTools; }
+  public get ncTools(): server.ToolNc[] { console.log((this.$store.state as AppModel).tooling.ncTools); return (this.$store.state as AppModel).tooling.ncTools; }
+  public get ncShanks(): server.ShankNc[] { return (this.$store.state as AppModel).tooling.ncShanks; }
 
   public get maxTools(): number {
     return (this.$store.state as AppModel).tooling.maxTools;
@@ -166,6 +171,7 @@ export default class toolingEquipment extends Vue {
       awaiter (Promise.all([
         await new ToolingService().GetNcTools(),
         await new ToolingService().GetNcFamilies(),
+        await new ToolingService().GetNcShanks(),
         await new ToolingService().GetToolsConfiguration()
       ]));
     }
@@ -471,6 +477,23 @@ export default class toolingEquipment extends Vue {
       return "../assets/icons/Tools/Tools.png"
   }
 
+  public getToolMagPosition = function (id) {
+    if (this.multitoolOptionActive)
+      return null    
+
+    var SH = this.ncShanks.filter(t => String(t.id).indexOf(id) >=0);
+    if(SH.length > 0)
+      return SH[0].magazineId;
+
+    return null;
+  }
+  
+  public getToolShankPosition = function (id) {
+    if (!this.multitoolOptionActive)    
+      return null
+    return id
+  }
+
   private internalCounter = -1;
   public addEdge() {
 
diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.vue b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.vue
index ffcbdf0c..f5db493c 100644
--- a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.vue
+++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.vue
@@ -29,11 +29,13 @@
                                  @click="selectTool(t)"></equipment>
                   </div>
                   <div class="list-vertical scrollable" ref="toolList" v-if="!isSiemens">
-                      <equipment v-for="t in ncTools.filter(t => String(t.familyId).indexOf(currentFilter) >=0)" 
+                      <equipment v-for="t in ncTools.filter(t => String(t.id).indexOf(currentFilter) >=0)" 
                                  :key="t.id" :code="'tooling_tool_abbreviation' | localize('T%d',t.id)" 
                                  :title="calcFamilyName(t.familyId)"
                                  :img-source="getToolIcon(t.toolType)"
                                  :class="{selected: selectedTool == t}"
+                                 :magPosition="getToolMagPosition(t.shankId)"
+                                 :shankPosition="getToolShankPosition(t.shankId)"
                                  @click="selectTool(t)"></equipment>
                   </div>
                   <div class="footer">