Make changes on page and class to include Client filter