[arctic-wolf] - Refactor code for multi selector