change the unique identifier for Notification -> few issues fixed