Normalize name and type on updates
Add sort functionality