issue #22067: remove fields from return line that should not be there
Merge pull request #1192 from shackbarth/22067

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