adding proper chosen directive, fixing few bugs related with workitems