cleaned up json support for class based list choice fields