feature/org_tags fix test