added more search filtering