Improved selected universe handling