better fav toggle managment