Fix "(null)" fields