Added search control and individual search criteria.