fixing unstable search: issue BHL-89