add filter option, tests wip