Updated search to make it easier to get at result filenames