[RCD] Patch to improve search