search MDL-25153 fixed performance problem