Make the search works without paths too