wip: extend filter with queries