Broken data handling with online analysis

Last-minute cleanup/fixes for module support broke data handling of scans using online analysis .