Adding ability to scope server role search by environment