diff --git a/db/routines/vn/procedures/itemProposal.sql b/db/routines/vn/procedures/itemProposal.sql
index 47a4e9779..d0d98fed7 100644
--- a/db/routines/vn/procedures/itemProposal.sql
+++ b/db/routines/vn/procedures/itemProposal.sql
@@ -19,17 +19,17 @@ BEGIN
 	DECLARE vTypeFk INT;
 	DECLARE vPriority INT DEFAULT 1;
 
-	DECLARE vTag1 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-	DECLARE vTag5 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-	DECLARE vTag6 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-	DECLARE vTag7 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-	DECLARE vTag8 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-	
-	DECLARE vValue1 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-	DECLARE vValue5 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-	DECLARE vValue6 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-	DECLARE vValue7 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-	DECLARE vValue8 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
+	DECLARE vTag1 VARCHAR(20) COLLATE 'utf8_unicode_ci';
+	DECLARE vTag5 VARCHAR(20) COLLATE 'utf8_unicode_ci';
+	DECLARE vTag6 VARCHAR(20) COLLATE 'utf8_unicode_ci';
+	DECLARE vTag7 VARCHAR(20) COLLATE 'utf8_unicode_ci';
+	DECLARE vTag8 VARCHAR(20) COLLATE 'utf8_unicode_ci';
+
+	DECLARE vValue1 VARCHAR(50) COLLATE 'utf8_unicode_ci';
+	DECLARE vValue5 VARCHAR(50) COLLATE 'utf8_unicode_ci';
+	DECLARE vValue6 VARCHAR(50) COLLATE 'utf8_unicode_ci';
+	DECLARE vValue7 VARCHAR(50) COLLATE 'utf8_unicode_ci';
+	DECLARE vValue8 VARCHAR(50) COLLATE 'utf8_unicode_ci';
 
 	SELECT warehouseFk, shipped
 		INTO vWarehouseFk, vShipped
@@ -86,7 +86,8 @@ BEGIN
 			IF(b.groupingMode = 1, b.grouping, b.packing) minQuantity,
 			iss.visible located
 		FROM item i
-			JOIN cache.available a ON a.item_id = i.id
+			STRAIGHT_JOIN cache.available a ON a.item_id = i.id
+				AND a.calc_id = vCalcFk
 			LEFT JOIN itemProposal ip ON ip.mateFk = i.id
 				AND ip.itemFk = vSelf
 			LEFT JOIN itemTag it ON it.itemFk = i.id
@@ -97,8 +98,7 @@ BEGIN
 			LEFT JOIN buy b ON b.id = lb.buy_id
 			LEFT JOIN itemShelvingStock iss ON iss.itemFk = i.id
 				AND iss.warehouseFk = vWarehouseFk
-		WHERE a.calc_id = vCalcFk
-			AND a.available > 0
+		WHERE a.available > 0
 			AND IF(vShowType, i.typeFk = vTypeFk, TRUE)
 			AND i.id <> vSelf
 		ORDER BY `counter` DESC,