add choices grouping using 'group by' expression
fix bug in arrow navigation