Missed this one before, refactor action pre-filters