Properly handle choice fields

Choice fields for both plots and tree should now convert correctly