Fixed bug with search. Fixed broken merge from sortinfo.