Update for feature/add-filters