Fixed up Subtopic Controller to make it function better