a little change on search part