Add search filters and tests