Refactored traffic selector handling in quick mode