fix choicelist