add name attribute to select dropdown
refactor scope label check