Added search filtering