Made changes to filter and feature