Added the filter handler