Fixed Bug on mobile with Notifcations causing crash
Improved metrics performace