Fixed search idempotent issue