Filenames now include the query type.