Feature/fix tag stripping