Better handling of adding the fulltopic to subtopic handlers