Fixed file format detection/selection