Getting rid of auto adding the entity name as a tag. This saves situation where name is changed and old name remains as a tag erronously.