diff --git a/src/main/java/de/metas/ui/web/address/AddressRegionLookupDescriptor.java b/src/main/java/de/metas/ui/web/address/AddressRegionLookupDescriptor.java
index c5835bbf0..602a1d58d 100644
--- a/src/main/java/de/metas/ui/web/address/AddressRegionLookupDescriptor.java
+++ b/src/main/java/de/metas/ui/web/address/AddressRegionLookupDescriptor.java
@@ -111,7 +111,7 @@ public boolean hasParameters()
 	@Override
 	public Set<String> getDependsOnFieldNames()
 	{
-		return CtxNames.asNames(PARAMETERS);
+		return CtxNames.toNames(PARAMETERS);
 	}
 
 	@Override
diff --git a/src/main/java/de/metas/ui/web/picking/PickingSlotRow.java b/src/main/java/de/metas/ui/web/picking/PickingSlotRow.java
index d6bc0488e..38149963f 100644
--- a/src/main/java/de/metas/ui/web/picking/PickingSlotRow.java
+++ b/src/main/java/de/metas/ui/web/picking/PickingSlotRow.java
@@ -367,6 +367,9 @@ public static final PickingSlotRowId ofPickingSlotId(final int pickingSlotId)
 
 		public static final PickingSlotRowId ofHU(final int pickingSlotId, final int huId, final int huStorageProductId)
 		{
+			Preconditions.checkArgument(pickingSlotId > 0, "pickingSlotId > 0");
+			Preconditions.checkArgument(huId > 0, "huId > 0");
+
 			return new PickingSlotRowId(pickingSlotId, huId, huStorageProductId);
 		}
 
diff --git a/src/main/java/de/metas/ui/web/window/descriptor/DocumentEntityDescriptor.java b/src/main/java/de/metas/ui/web/window/descriptor/DocumentEntityDescriptor.java
index aa33be6eb..97618a8aa 100644
--- a/src/main/java/de/metas/ui/web/window/descriptor/DocumentEntityDescriptor.java
+++ b/src/main/java/de/metas/ui/web/window/descriptor/DocumentEntityDescriptor.java
@@ -712,7 +712,7 @@ private DocumentFieldDependencyMap buildDependencies()
 			final DocumentFieldDependencyMap.Builder dependenciesBuilder = DocumentFieldDependencyMap.builder();
 
 			dependenciesBuilder.add(DocumentFieldDependencyMap.DOCUMENT_Readonly, 
-					getReadonlyLogic().getParametersAsPlainStrings(), 
+					getReadonlyLogic().getParameterNames(), 
 					DependencyType.DocumentReadonlyLogic);
 
 			getFields().values().stream().forEach(field -> dependenciesBuilder.add(field.getDependencies()));
diff --git a/src/main/java/de/metas/ui/web/window/descriptor/DocumentFieldDescriptor.java b/src/main/java/de/metas/ui/web/window/descriptor/DocumentFieldDescriptor.java
index 280c2eb5f..8d387fb93 100644
--- a/src/main/java/de/metas/ui/web/window/descriptor/DocumentFieldDescriptor.java
+++ b/src/main/java/de/metas/ui/web/window/descriptor/DocumentFieldDescriptor.java
@@ -1269,9 +1269,9 @@ private Optional<DocumentFieldDataBindingDescriptor> getDataBinding()
 		private DocumentFieldDependencyMap buildDependencies()
 		{
 			final DocumentFieldDependencyMap.Builder dependencyMapBuilder = DocumentFieldDependencyMap.builder()
-					.add(fieldName, getReadonlyLogicEffective().getParametersAsPlainStrings(), DependencyType.ReadonlyLogic)
-					.add(fieldName, getDisplayLogic().getParametersAsPlainStrings(), DependencyType.DisplayLogic)
-					.add(fieldName, getMandatoryLogicEffective().getParametersAsPlainStrings(), DependencyType.MandatoryLogic);
+					.add(fieldName, getReadonlyLogicEffective().getParameterNames(), DependencyType.ReadonlyLogic)
+					.add(fieldName, getDisplayLogic().getParameterNames(), DependencyType.DisplayLogic)
+					.add(fieldName, getMandatoryLogicEffective().getParameterNames(), DependencyType.MandatoryLogic);
 
 			final LookupDescriptor lookupDescriptor = getLookupDescriptorProvider().provideForScope(LookupScope.DocumentField);
 			if (lookupDescriptor != null)
diff --git a/src/main/java/de/metas/ui/web/window/descriptor/sql/AutoSequenceDefaultValueExpression.java b/src/main/java/de/metas/ui/web/window/descriptor/sql/AutoSequenceDefaultValueExpression.java
index ddb3d54dd..c98e7c5f3 100644
--- a/src/main/java/de/metas/ui/web/window/descriptor/sql/AutoSequenceDefaultValueExpression.java
+++ b/src/main/java/de/metas/ui/web/window/descriptor/sql/AutoSequenceDefaultValueExpression.java
@@ -76,9 +76,9 @@ public String getExpressionString()
 	}
 
 	@Override
-	public Set<String> getParametersAsPlainStrings()
+	public Set<String> getParameterNames()
 	{
-		return CtxNames.asNames(PARAMETERS);
+		return CtxNames.toNames(PARAMETERS);
 	}
 
 	@Override
diff --git a/src/main/java/de/metas/ui/web/window/descriptor/sql/SqlDefaultValueExpression.java b/src/main/java/de/metas/ui/web/window/descriptor/sql/SqlDefaultValueExpression.java
index 7283fad3a..b97d50fed 100644
--- a/src/main/java/de/metas/ui/web/window/descriptor/sql/SqlDefaultValueExpression.java
+++ b/src/main/java/de/metas/ui/web/window/descriptor/sql/SqlDefaultValueExpression.java
@@ -152,9 +152,9 @@ public String getFormatedExpressionString()
 	}
 
 	@Override
-	public Set<String> getParametersAsPlainStrings()
+	public Set<String> getParameterNames()
 	{
-		return stringExpression.getParametersAsPlainStrings();
+		return stringExpression.getParameterNames();
 	}
 
 	@Override
diff --git a/src/main/java/de/metas/ui/web/window/descriptor/sql/SqlLookupDescriptor.java b/src/main/java/de/metas/ui/web/window/descriptor/sql/SqlLookupDescriptor.java
index 1a2e829f9..d1d492b98 100644
--- a/src/main/java/de/metas/ui/web/window/descriptor/sql/SqlLookupDescriptor.java
+++ b/src/main/java/de/metas/ui/web/window/descriptor/sql/SqlLookupDescriptor.java
@@ -362,7 +362,7 @@ private SqlLookupDescriptor build()
 				}
 
 				dependsOnFieldNames = ImmutableSet.<String> builder()
-						.addAll(validationRule.getPrefilterWhereClause().getParametersAsPlainStrings())
+						.addAll(validationRule.getPrefilterWhereClause().getParameterNames())
 						.addAll(validationRule.getPostQueryFilter().getParameters())
 						.build();
 			}
diff --git a/src/main/java/de/metas/ui/web/window/model/lookup/LookupDataSourceContext.java b/src/main/java/de/metas/ui/web/window/model/lookup/LookupDataSourceContext.java
index 36d74948d..f20fdf713 100644
--- a/src/main/java/de/metas/ui/web/window/model/lookup/LookupDataSourceContext.java
+++ b/src/main/java/de/metas/ui/web/window/model/lookup/LookupDataSourceContext.java
@@ -303,7 +303,7 @@ public LookupDataSourceContext build()
 			//
 			// Collect all values required by the post-query predicate
 			// failIfNotFound=false because it might be that NOT all postQueryPredicate's parameters are mandatory!
-			collectContextValues(CtxNames.parseStrings(postQueryPredicate.getParameters()), false);
+			collectContextValues(CtxNames.parseAll(postQueryPredicate.getParameters()), false);
 
 			//
 			// Build the effective context