fix entity type (TODO : dix collection creation / deletion)
[form type] clean & comment