refactored redirect to filters
refactored again