more scanner fixes
Merge remote-tracking branch 'tgriesser/document-separator'