Update form and sorting