Improve handling / fixing of rows with info for O and D