Imrpoved the searching behavior.