Staff defaults working, enforce logged in requirement for staff-only filters, and some clean-up