fix browsing by speaker (ugly cut-and-paste code)