Fix discussion display, handle Vanilla 2.1 serialize bug