Form controllers and catalogs now return the `item`, not `(label, item)`. Use unicode instead of str.