some fixes to last search commit