Fix classification values in search form
Add datagrid fields management