Refactors filter helpers