wip - fixes for filter per action functionality.