Fix NULL row ids