BZ-8860:BZ-8861:BZ-8862: Calculator notifications aren't all being received by company contact

This is the Changes for Notification issues