Fix data return for cart and wishlist