Moved Topic detection to view
One little change