Add ability to scope client role search by environment