Changes in filter handler