Cleaned up the topic keywords functionality.