made topic change javascript a bit better
Merge branch 'feature'