Support select fields, add missing curley brackets