Less bugs when removing favs