add multistream fix
fix favorites button
fix merge