move watchers out from DateHolder/EventsCollection/ShiftsDayHolder
fixed more bugs