Further fixes to empty wishlist