fixed some search problem and added 'searchBy'