Checkpoint
Fixed advanced filter parsing.