fix for searching, fix for default search by option