fix validate values when choices key is not string
PEP8!

life is so mean to newbies
* fix display current values
PEP8
Merge branch 'v2-choicelist-validate' into v2