Fix picklist formatting on create/update

#46