Index: /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/WeblogParser.java
===================================================================
--- /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/WeblogParser.java	(revision 362)
+++ /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/WeblogParser.java	(revision 363)
@@ -287,7 +287,5 @@
 			if (values.length == 6) { // post vars found
 				for (String postVar : values[5].trim().split(" ")) {
-					// TODO manual filtering of bad variables, should be
-					// automated
-					if (!postVar.contains("and")) {
+					if (!isBrokenVariable(postVar)) {
 						postedVars.add(postVar);
 					}
@@ -456,6 +454,5 @@
 			for (String paramPair : paramPairs) {
 				String[] paramSplit = paramPair.split("=");
-				// TODO manual filtering of bad variables, should be automated
-				if (!paramSplit[0].contains("and")) {
+				if (!isBrokenVariable(paramSplit[0])) {
 					getVars.add(paramSplit[0]);
 				}
@@ -464,3 +461,18 @@
 		return getVars;
 	}
+
+	/**
+	 * <p>
+	 * Checks if a variable is broken.Currently, the check rather imprecise and
+	 * checks only if the term &quot;and&quot; is part of the variable name.
+	 * </p>
+	 * 
+	 * @param var
+	 *            variable that is checked
+	 * @return true if the variable is broken, false otherwise
+	 */
+	private boolean isBrokenVariable(String var) {
+		// TODO improve filtering of broken variables
+		return var.contains("and");
+	}
 }