Fixed Search Duplicate ID problem