re-arrange discussion implements
fix missing collection bug