Fixed ndb generation where field has choices and is repeated