Discovered an issue where the topics were being overriden

Also revert using the classification module as topics can also be added
via policies