Fixed topics to handle whitespace