trace: string filter fixes
Merge branch 'merge-mojo-1404' of github.com:barycz/whs-trace into merge-mojo-1404