issue #21672: more tweaks.
issue #21672: make sure rows present correctly.