Fix for Enum and DB list field