Fix duplicate and search whole list