fix & improve default search