Add filter parsing