Configure scope on re-evaluation and prioritize CLI scope options