[FIX] renamed finder tags
[FIX] fixed #518
Merge pull request #595 from weese/feature/stream-fixes

[FIX] fixed #518