Always return the row
Typo fixes and add support for planitems.