Work in progress
Fixed file name generation for topics