Added find_list before filter