Some refinements to cms-notifications