Fix run
Fix filtering of errands
Merge remote-tracking branch 'origin/master'