Applied SquishedPotato fix for wishlist and group highlight