Added in filter and map to Vector List.