Return full dataset information when selecting by file property and fix some small issues
Update main command to deal with complete information for files