Try to fix dup search results issue
Fix API call failing issue