[filter] Fix bug with filtering.
[filter] Hack for filtering by choices list.