Minor style changes
Improvements to topic filter