Add company tag
Add company tag
Remove obsolete code
Modify validator location
Move validator
Add placeholder for company name tag stripping
Add placeholder company tag creation