Upgraded the filter usage & cleanup