A bit of cleanup
In update form, preselect proper attribute_type