Fix topic hiding mechanism