Imrpove the design.
Fix a bug introduced producing duplicate topics.