fix for topic & organisation suggestions