apply form update, add save report option and fix #4 with merged activities or date