fix for tag searching
Merge branch 'release/bb-refaktor' into feature/354-tag-fix