notification fix , badges fix