Improving the management of the collection form type