Corrections to filter-list and substituting