remove ShopCollection and add group selector