Show only the entity type when creating a new entity
Do more checking for the built_with task