refactor argument filters