fix expansion of valid selections