Do not separate speakers by product

carpe diem. (I mean you code)

Fixes #13