fixed issues with saving notes and broadcast events in service