Fix field definition types in the entityid handler