revising filter
revising search logic