Bugfixes in boolean expression parser