Updated both lists to use the filter