issue #22067: remove fields from return line that should not be there