fix up and down key problem
Merge branch 'fix-filter-select'