I started to do this change, but it fails to disambiguate facility selection from group selection in the code. I will change it to _group_select instead.