remove todo and fix typo

todo addressed by filtered collections pattern present in broadcast and
activity stream controllers