Added search filter. Seems to be done