core-5437 fix duplicate search