rearranging filter inputs, wip