Re-integrated default wishlist and heart tap code.