Fixed several issues with scrubber
Merge pull request #109 from n3-charts/fixes

Fixed several issues with scrubber