fix parsing and topic support