Added filter parsing, trying to fix a bug with expressions not parsing properly if operators are inside strings.