Further updates to empty Wishlist functionality