Fix wishlist page issues