fixes to collection reset and events