diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/ExtendedSearchController.java b/src/main/java/org/olat/modules/qpool/ui/metadata/ExtendedSearchController.java
index 10e8974268856dba26295ceafbd500746fe687d2..19f79cd42eb94db4d9127e887b99805d4fa58868 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/ExtendedSearchController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/ExtendedSearchController.java
@@ -140,10 +140,11 @@ public class ExtendedSearchController extends FormBasicController implements Ext
 			}
 		} else if(source instanceof FormLink) {
 			FormLink button = (FormLink)source;
-			ConditionalQuery query = (ConditionalQuery)button.getUserObject();
 			if(button.getCmd().startsWith("add")) {
+				ConditionalQuery query = (ConditionalQuery)button.getUserObject();
 				addParameter(query);
 			} else if(button.getCmd().startsWith("remove")) {
+				ConditionalQuery query = (ConditionalQuery)button.getUserObject();
 				removeParameter(query);
 			}
 		}