Fixed bugs with removing/adding streams with selection