DO NOT MERGE: Fixing Entities

There is a `choices` options for fields that will select a value from choices, that is booby behaviour