Refactored to use of filterable list.