Merge pull request #733 from fabro-sh/fix/list-view-filter-options