diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/RunCannedQueryToolbar.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/RunCannedQueryToolbar.java
index 22ed4961558028490fdfdc70d2265a61777bba03..80ee9b2c80efcac9e1f61921cac2456644cd2cbb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/RunCannedQueryToolbar.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/RunCannedQueryToolbar.java
@@ -192,11 +192,12 @@ public class RunCannedQueryToolbar extends AbstractQueryProviderToolbar
             };
         for (String parameterName : query.getParameters())
         {
+            final String strippedParameterName = stripMetadata(parameterName);
             final QueryParameterValue initialValueOrNull =
-                    tryGetInitialValue(stripMetadata(parameterName));
+                    tryGetInitialValue(strippedParameterName);
             if (initialValueOrNull != null && initialValueOrNull.isFixed())
             {
-                addInitialBinding(parameterName, initialValueOrNull.getValue());
+                addInitialBinding(strippedParameterName, initialValueOrNull.getValue());
             } else
             {
                 addParameterField(ParameterField.create(viewContext, parameterName,