Fixed some issues will grouped notifications / cronjob