#18 Fix default search