--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQSelect.java	Thu Feb 16 12:35:51 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQSelect.java	Fri Feb 17 11:29:41 2012 +0000
@@ -89,8 +89,8 @@
             return super.createStaticData(flys, creator, cc, name, value, type);
         }
 
-        String mode = flys.getDataAsString(WQ_MODE);
-        String free = flys.getDataAsString(WQ_FREE);
+        boolean isQ = flys.getDataAsBoolean(WQ_MODE);
+        boolean isFree = flys.getDataAsBoolean(WQ_FREE);
 
         WINFOArtifact winfo = (WINFOArtifact) flys;
 
@@ -103,7 +103,7 @@
 
         String label;
 
-        if (mode == null || mode.equals("W") || Boolean.valueOf(free)) {
+        if (!isQ || isFree) {
             label = getLabel(winfo, cc, value);
         }
         else {
@@ -454,9 +454,11 @@
         WINFOArtifact flys = (WINFOArtifact) artifact;
 
         StateData data       = getData(flys, WQ_SELECTION);
-        String selectionMode = data != null ? (String) data.getValue() : null;
+        boolean isRange = data != null 
+            ? Boolean.valueOf((String) data.getValue())
+            : false;
 
-        if (selectionMode == null || selectionMode.equals("single")) {
+        if (!isRange) {
             return validateSingle(artifact);
         }
         else {