Added better handling of changed topics.