refactor bunny subscription a bit