Don't render empty selections
Change selection specs to match new rendering scheme