basic filter working matches 1.x branch