Fixed null content bug, fixed double notifications bug