diff --git a/src/strategy/actions/InventoryAction.cpp b/src/strategy/actions/InventoryAction.cpp
index cf974216..1dd16b5a 100644
--- a/src/strategy/actions/InventoryAction.cpp
+++ b/src/strategy/actions/InventoryAction.cpp
@@ -282,10 +282,12 @@ std::vector<Item*> InventoryAction::parseItems(std::string const text, IterateIt
         IterateItems(&visitor, ITERATE_ITEMS_IN_BAGS);
         found.insert(visitor.GetResult().begin(), visitor.GetResult().end());
     }
-    
-    FindUsableNamedItemVisitor visitor(bot);
-    IterateItems(&visitor, ITERATE_ITEMS_IN_BAGS);
-    found.insert(visitor.GetResult().begin(), visitor.GetResult().end());
+    if (text == "")
+    {
+        FindUsableNamedItemVisitor visitor(bot);
+        IterateItems(&visitor, ITERATE_ITEMS_IN_BAGS);
+        found.insert(visitor.GetResult().begin(), visitor.GetResult().end());
+    }
 
     uint32 quality = chat->parseItemQuality(text);
     if (quality != MAX_ITEM_QUALITY)
diff --git a/src/strategy/actions/UseItemAction.cpp b/src/strategy/actions/UseItemAction.cpp
index 4032c31a..ad4917dc 100644
--- a/src/strategy/actions/UseItemAction.cpp
+++ b/src/strategy/actions/UseItemAction.cpp
@@ -19,19 +19,7 @@ bool UseItemAction::Execute(Event event)
 
     if (gos.empty())
     {
-        if (items.size() > 1)
-        {
-            std::vector<Item*>::iterator i = items.begin();
-            Item* item = *i++;
-            Item* itemTarget = *i;
-
-            if (item->IsPotion() || item->GetTemplate()->Class == ITEM_CLASS_CONSUMABLE)
-                return UseItemAuto(item);
-            else
-                return UseItemOnItem(item, itemTarget);
-        }
-        else if (!items.empty())
-            return UseItemAuto(*items.begin());
+        return UseItemAuto(*items.begin());
     }
     else
     {
diff --git a/src/strategy/actions/UseItemAction.h b/src/strategy/actions/UseItemAction.h
index 8a6fae95..7a92cfed 100644
--- a/src/strategy/actions/UseItemAction.h
+++ b/src/strategy/actions/UseItemAction.h
@@ -73,7 +73,7 @@ class UseRandomRecipe : public UseItemAction
 
         bool isUseful() override;
         bool isPossible() override;
-        bool Execute(Event event);
+        bool Execute(Event event) override;
 };
 
 class UseRandomQuestItem : public UseItemAction