fix entries with null type