Fixed the extraction of model name from file, and key on which results are sorted.