Kafka topic reporter minor bug fixes, refactoring.