diff --git a/src/fujimn_int.cpp b/src/fujimn_int.cpp
index f7ed55c6..c77a18a2 100644
--- a/src/fujimn_int.cpp
+++ b/src/fujimn_int.cpp
@@ -371,50 +371,52 @@ constexpr TagInfo FujiMakerNote::tagInfo_[] = {
      N_("This number is unique, and contains the date of manufacture, "
         "but is not the same as the number printed on the camera body."),
      IfdId::fujiId, SectionId::makerTags, asciiString, -1, printValue},
-    {0x1000, "Quality", N_("Quality"), N_("Image quality setting"), IfdId::fujiId, SectionId::makerTags, asciiString, -1, printValue},
-    {0x1001, N_("Sharpness"), N_("Sharpness"), N_("Sharpness setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     EXV_PRINT_TAG(fujiSharpness)},
-    {0x1002, "WhiteBalance", N_("White Balance"), N_("White balance setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     EXV_PRINT_TAG(fujiWhiteBalance)},
-    {0x1003, "Color", N_("Color"), N_("Chroma saturation setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     EXV_PRINT_TAG(fujiColor)},
+    {0x1000, "Quality", N_("Quality"), N_("Image quality setting"), IfdId::fujiId, SectionId::makerTags, asciiString,
+     -1, printValue},
+    {0x1001, N_("Sharpness"), N_("Sharpness"), N_("Sharpness setting"), IfdId::fujiId, SectionId::makerTags,
+     unsignedShort, -1, EXV_PRINT_TAG(fujiSharpness)},
+    {0x1002, "WhiteBalance", N_("White Balance"), N_("White balance setting"), IfdId::fujiId, SectionId::makerTags,
+     unsignedShort, -1, EXV_PRINT_TAG(fujiWhiteBalance)},
+    {0x1003, "Color", N_("Color"), N_("Chroma saturation setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort,
+     -1, EXV_PRINT_TAG(fujiColor)},
     {0x1004, "Tone", N_("Tone"), N_("Tone (contrast) setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
      EXV_PRINT_TAG(fujiTone)},
-    {0x1005, "ColorTemperature", N_("Color Temperature"), N_("Color temperature setting"), IfdId::fujiId, SectionId::makerTags,
-     unsignedShort, -1, printValue},
+    {0x1005, "ColorTemperature", N_("Color Temperature"), N_("Color temperature setting"), IfdId::fujiId,
+     SectionId::makerTags, unsignedShort, -1, printValue},
     {0x1006, "Contrast", N_("Contrast"), N_("Contrast setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
      EXV_PRINT_TAG(fujiContrast)},
-    {0x100a, "WhiteBalanceFineTune", N_("White Balance Fine Tune"), N_("White balance fine tune setting"), IfdId::fujiId,
-     SectionId::makerTags, signedLong, -1, printFujiWhiteBalanceFineTune},
-    {0x100b, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort,
-     -1, EXV_PRINT_TAG(fujiNoiseReduction)},
-    {0x100e, "HighIsoNoiseReduction", N_("High ISO Noise Reduction"), N_("High ISO NR setting"), IfdId::fujiId, SectionId::makerTags,
-     unsignedShort, -1, EXV_PRINT_TAG(fujiHighIsoNR)},
+    {0x100a, "WhiteBalanceFineTune", N_("White Balance Fine Tune"), N_("White balance fine tune setting"),
+     IfdId::fujiId, SectionId::makerTags, signedLong, -1, printFujiWhiteBalanceFineTune},
+    {0x100b, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction setting"), IfdId::fujiId,
+     SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiNoiseReduction)},
+    {0x100e, "HighIsoNoiseReduction", N_("High ISO Noise Reduction"), N_("High ISO NR setting"), IfdId::fujiId,
+     SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiHighIsoNR)},
     {0x100f, "Clarity", N_("Clarity"), N_("Clarity setting"), IfdId::fujiId, SectionId::makerTags, signedLong, -1,
      EXV_PRINT_TAG(fujiClarity)},
-    {0x1010, "FlashMode", N_("Flash Mode"), N_("Flash firing mode setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     EXV_PRINT_TAG(fujiFlashMode)},
-    {0x1011, "FlashStrength", N_("Flash Strength"), N_("Flash firing strength compensation setting"), IfdId::fujiId, SectionId::makerTags,
-     signedRational, -1, printValue},
+    {0x1010, "FlashMode", N_("Flash Mode"), N_("Flash firing mode setting"), IfdId::fujiId, SectionId::makerTags,
+     unsignedShort, -1, EXV_PRINT_TAG(fujiFlashMode)},
+    {0x1011, "FlashStrength", N_("Flash Strength"), N_("Flash firing strength compensation setting"), IfdId::fujiId,
+     SectionId::makerTags, signedRational, -1, printValue},
     {0x1020, "Macro", N_("Macro"), N_("Macro mode setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
      EXV_PRINT_TAG(fujiOffOn)},
-    {0x1021, "FocusMode", N_("Focus Mode"), N_("Focusing mode setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     EXV_PRINT_TAG(fujiFocusMode)},
-    {0x1022, "FocusArea", "Focus Area", N_("Focus area setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     EXV_PRINT_TAG(fujiFocusArea)},
-    {0x1023, "FocusPoint", N_("Focus Point"), N_("X and Y coordinate of focus point"), IfdId::fujiId, SectionId::makerTags, unsignedShort,
-     -1, printValue},
-    {0x102b, "FocusPrioritySetting", N_("Focus Priority Setting"), N_("Focus priority setting"), IfdId::fujiId, SectionId::makerTags,
-     unsignedShort, -1, printValue},
-    {0x102d, "FocusSetting", N_("Focus Setting"), N_("Focus setting"), IfdId::fujiId, SectionId::makerTags, unsignedLong, -1, printValue},
-    {0x102e, "ContinuousFocusSetting", N_("AF-C Focus Setting"), N_("AF-C focus setting"), IfdId::fujiId, SectionId::makerTags,
+    {0x1021, "FocusMode", N_("Focus Mode"), N_("Focusing mode setting"), IfdId::fujiId, SectionId::makerTags,
+     unsignedShort, -1, EXV_PRINT_TAG(fujiFocusMode)},
+    {0x1022, "FocusArea", "Focus Area", N_("Focus area setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort,
+     -1, EXV_PRINT_TAG(fujiFocusArea)},
+    {0x1023, "FocusPoint", N_("Focus Point"), N_("X and Y coordinate of focus point"), IfdId::fujiId,
+     SectionId::makerTags, unsignedShort, -1, printValue},
+    {0x102b, "FocusPrioritySetting", N_("Focus Priority Setting"), N_("Focus priority setting"), IfdId::fujiId,
+     SectionId::makerTags, unsignedShort, -1, printValue},
+    {0x102d, "FocusSetting", N_("Focus Setting"), N_("Focus setting"), IfdId::fujiId, SectionId::makerTags,
      unsignedLong, -1, printValue},
-    {0x1030, "SlowSync", N_("Slow Sync"), N_("Slow synchro mode setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     EXV_PRINT_TAG(fujiOffOn)},
-    {0x1031, "PictureMode", N_("Picture Mode"), N_("Picture mode setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     EXV_PRINT_TAG(fujiPictureMode)},
-    {0x1032, "ExposureCount", "Exposure Count", N_("Number of exposures used for this image"), IfdId::fujiId, SectionId::makerTags,
-     unsignedShort, -1, printValue},
+    {0x102e, "ContinuousFocusSetting", N_("AF-C Focus Setting"), N_("AF-C focus setting"), IfdId::fujiId,
+     SectionId::makerTags, unsignedLong, -1, printValue},
+    {0x1030, "SlowSync", N_("Slow Sync"), N_("Slow synchro mode setting"), IfdId::fujiId, SectionId::makerTags,
+     unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)},
+    {0x1031, "PictureMode", N_("Picture Mode"), N_("Picture mode setting"), IfdId::fujiId, SectionId::makerTags,
+     unsignedShort, -1, EXV_PRINT_TAG(fujiPictureMode)},
+    {0x1032, "ExposureCount", "Exposure Count", N_("Number of exposures used for this image"), IfdId::fujiId,
+     SectionId::makerTags, unsignedShort, -1, printValue},
     {0x1033, "EXRAuto", "EXR Auto",
      N_("EXR Auto"),  // TODO find description
      IfdId::fujiId, SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)},
@@ -423,16 +425,16 @@ constexpr TagInfo FujiMakerNote::tagInfo_[] = {
      IfdId::fujiId, SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiExrMode)},
     {0x1040, "ShadowTone", N_("Shadow Tone"), N_("Shadow tone"), IfdId::fujiId, SectionId::makerTags, signedLong, -1,
      EXV_PRINT_TAG(fujiSHTone)},
-    {0x1041, "HighlightTone", N_("Highlight Tone"), N_("Highlight tone"), IfdId::fujiId, SectionId::makerTags, signedLong, -1,
-     EXV_PRINT_TAG(fujiSHTone)},
-    {0x1044, "DigitalZoom", N_("Digital Zoom"), N_("Digital zoom"), IfdId::fujiId, SectionId::makerTags, unsignedLong, -1,
-     printFujiDigitalZoom},
+    {0x1041, "HighlightTone", N_("Highlight Tone"), N_("Highlight tone"), IfdId::fujiId, SectionId::makerTags,
+     signedLong, -1, EXV_PRINT_TAG(fujiSHTone)},
+    {0x1044, "DigitalZoom", N_("Digital Zoom"), N_("Digital zoom"), IfdId::fujiId, SectionId::makerTags, unsignedLong,
+     -1, printFujiDigitalZoom},
     {0x1045, "LensModulationOptimizer", N_("Lens Modulation Optimizer"), N_("Lens modulation optimizer setting"),
      IfdId::fujiId, SectionId::makerTags, unsignedLong, -1, EXV_PRINT_TAG(fujiOffOn)},
     {0x1047, "GrainEffectRoughness", N_("Grain Effect Roughness"), N_("Grain effect roughness setting"), IfdId::fujiId,
      SectionId::makerTags, signedLong, -1, EXV_PRINT_TAG(fujiOff0Weak32Strong64)},
-    {0x1048, "ColorChromeEffect", N_("Color Chrome Effect"), N_("Color Chrome Effect"), IfdId::fujiId, SectionId::makerTags, signedLong,
-     -1, EXV_PRINT_TAG(fujiOff0Weak32Strong64)},
+    {0x1048, "ColorChromeEffect", N_("Color Chrome Effect"), N_("Color Chrome Effect"), IfdId::fujiId,
+     SectionId::makerTags, signedLong, -1, EXV_PRINT_TAG(fujiOff0Weak32Strong64)},
     {0x1049, "MonochromaticColorWC", N_("Monochromatic Color (Warm-Cool)"),
      N_("Monochromatic color (warm-cool) setting. High value results in warm color shift and low values in cold color "
         "shift."),
@@ -441,94 +443,99 @@ constexpr TagInfo FujiMakerNote::tagInfo_[] = {
      N_("Monochromatic color (magenta-green) setting. High value results in magenta color shift and low values in "
         "green color shift."),
      IfdId::fujiId, SectionId::makerTags, unsignedByte, -1, printFujiMonochromaticColor},
-    {0x104c, "GrainEffectSize", N_("Grain Effect Size"), N_("Grain effect size setting"), IfdId::fujiId, SectionId::makerTags,
-     unsignedShort, -1, EXV_PRINT_TAG(fujiOff0Weak32Strong64)},
+    {0x104c, "GrainEffectSize", N_("Grain Effect Size"), N_("Grain effect size setting"), IfdId::fujiId,
+     SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiOff0Weak32Strong64)},
     {0x104d, "CropMode", N_("Crop Mode"), N_("Crop mode"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
      EXV_PRINT_TAG(fujiCropMode)},
-    {0x104e, "ColorChromeFXBlue", N_("Color Chrome FX Blue"), N_("Color Chrome FX Blue"), IfdId::fujiId, SectionId::makerTags, signedLong,
-     -1, EXV_PRINT_TAG(fujiOff0Weak32Strong64)},
-    {0x1050, "ShutterType", N_("Shutter Type"), N_("Shutter type"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     EXV_PRINT_TAG(fujiShutterType)},
-    {0x1100, "Continuous", N_("Continuous"), N_("Continuous shooting or auto bracketing setting"), IfdId::fujiId, SectionId::makerTags,
-     unsignedShort, -1, EXV_PRINT_TAG(fujiContinuous)},
-    {0x1101, "SequenceNumber", N_("Sequence Number"), N_("Sequence number"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     printValue},
-    {0x1103, "DriveSetting", N_("Drive Setting"), N_("Drive setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     printFujiDriveSetting},
-    {0x1105, "PixelShiftShots", N_("Pixel Shift Shots"), N_("Pixel shift shots"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     printValue},
-    {0x1105, "PixelShiftOfffset", N_("Pixel Shift Offset"), N_("Pixel shift offset"), IfdId::fujiId, SectionId::makerTags, signedRational,
-     -1, printValue},
-    {0x1153, "PanoramaAngle", N_("Panorama angle"), N_("Panorama angle"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     printValue},
-    {0x1154, "PanoramaDirection", N_("Panorama direction"), N_("Panorama direction"), IfdId::fujiId, SectionId::makerTags, unsignedShort,
-     -1, EXV_PRINT_TAG(fujiPanoramaDirection)},
+    {0x104e, "ColorChromeFXBlue", N_("Color Chrome FX Blue"), N_("Color Chrome FX Blue"), IfdId::fujiId,
+     SectionId::makerTags, signedLong, -1, EXV_PRINT_TAG(fujiOff0Weak32Strong64)},
+    {0x1050, "ShutterType", N_("Shutter Type"), N_("Shutter type"), IfdId::fujiId, SectionId::makerTags, unsignedShort,
+     -1, EXV_PRINT_TAG(fujiShutterType)},
+    {0x1100, "Continuous", N_("Continuous"), N_("Continuous shooting or auto bracketing setting"), IfdId::fujiId,
+     SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiContinuous)},
+    {0x1101, "SequenceNumber", N_("Sequence Number"), N_("Sequence number"), IfdId::fujiId, SectionId::makerTags,
+     unsignedShort, -1, printValue},
+    {0x1103, "DriveSetting", N_("Drive Setting"), N_("Drive setting"), IfdId::fujiId, SectionId::makerTags,
+     unsignedShort, -1, printFujiDriveSetting},
+    {0x1105, "PixelShiftShots", N_("Pixel Shift Shots"), N_("Pixel shift shots"), IfdId::fujiId, SectionId::makerTags,
+     unsignedShort, -1, printValue},
+    {0x1105, "PixelShiftOfffset", N_("Pixel Shift Offset"), N_("Pixel shift offset"), IfdId::fujiId,
+     SectionId::makerTags, signedRational, -1, printValue},
+    {0x1153, "PanoramaAngle", N_("Panorama angle"), N_("Panorama angle"), IfdId::fujiId, SectionId::makerTags,
+     unsignedShort, -1, printValue},
+    {0x1154, "PanoramaDirection", N_("Panorama direction"), N_("Panorama direction"), IfdId::fujiId,
+     SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiPanoramaDirection)},
     {0x1200, "0x1200", "0x1200", N_("Unknown"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1, printValue},
-    {0x1201, "AdvancedFilter", N_("Advanced filter"), N_("Advanced filter setting"), IfdId::fujiId, SectionId::makerTags, unsignedLong,
-     -1, EXV_PRINT_TAG(fujiAdvancedFilter)},
-    {0x1210, "FinePixColor", N_("FinePix Color"), N_("Fuji FinePix color setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort,
-     -1, EXV_PRINT_TAG(fujiFinePixColor)},
-    {0x1300, "BlurWarning", N_("Blur Warning"), N_("Blur warning status"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     EXV_PRINT_TAG(fujiOffOn)},
-    {0x1301, "FocusWarning", N_("Focus Warning"), N_("Auto Focus warning status"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     EXV_PRINT_TAG(fujiOffOn)},
-    {0x1302, "ExposureWarning", N_("Exposure Warning"), N_("Auto exposure warning status"), IfdId::fujiId, SectionId::makerTags,
+    {0x1201, "AdvancedFilter", N_("Advanced filter"), N_("Advanced filter setting"), IfdId::fujiId,
+     SectionId::makerTags, unsignedLong, -1, EXV_PRINT_TAG(fujiAdvancedFilter)},
+    {0x1210, "FinePixColor", N_("FinePix Color"), N_("Fuji FinePix color setting"), IfdId::fujiId, SectionId::makerTags,
+     unsignedShort, -1, EXV_PRINT_TAG(fujiFinePixColor)},
+    {0x1300, "BlurWarning", N_("Blur Warning"), N_("Blur warning status"), IfdId::fujiId, SectionId::makerTags,
+     unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)},
+    {0x1301, "FocusWarning", N_("Focus Warning"), N_("Auto Focus warning status"), IfdId::fujiId, SectionId::makerTags,
      unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)},
-    {0x1400, "DynamicRange", N_("Dynamic Range"), N_("Dynamic range"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     EXV_PRINT_TAG(fujiDynamicRange)},
+    {0x1302, "ExposureWarning", N_("Exposure Warning"), N_("Auto exposure warning status"), IfdId::fujiId,
+     SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)},
+    {0x1400, "DynamicRange", N_("Dynamic Range"), N_("Dynamic range"), IfdId::fujiId, SectionId::makerTags,
+     unsignedShort, -1, EXV_PRINT_TAG(fujiDynamicRange)},
     {0x1401, "FilmMode", N_("Film Mode"), N_("Film mode"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
      EXV_PRINT_TAG(fujiFilmMode)},
-    {0x1402, "DynamicRangeSetting", N_("Dynamic Range Setting"), N_("Dynamic range settings"), IfdId::fujiId, SectionId::makerTags,
-     unsignedShort, -1, EXV_PRINT_TAG(fujiDynamicRangeSetting)},
+    {0x1402, "DynamicRangeSetting", N_("Dynamic Range Setting"), N_("Dynamic range settings"), IfdId::fujiId,
+     SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiDynamicRangeSetting)},
     {0x1403, "DevelopmentDynamicRange", N_("Development Dynamic Range"), N_("Development dynamic range"), IfdId::fujiId,
      SectionId::makerTags, unsignedShort, -1, printValue},
-    {0x1404, "MinFocalLength", N_("Minimum Focal Length"), N_("Minimum focal length"), IfdId::fujiId, SectionId::makerTags,
-     unsignedRational, -1, printValue},
-    {0x1405, "MaxFocalLength", N_("Maximum Focal Length"), N_("Maximum focal length"), IfdId::fujiId, SectionId::makerTags,
-     unsignedRational, -1, printValue},
+    {0x1404, "MinFocalLength", N_("Minimum Focal Length"), N_("Minimum focal length"), IfdId::fujiId,
+     SectionId::makerTags, unsignedRational, -1, printValue},
+    {0x1405, "MaxFocalLength", N_("Maximum Focal Length"), N_("Maximum focal length"), IfdId::fujiId,
+     SectionId::makerTags, unsignedRational, -1, printValue},
     {0x1406, "MaxApertureAtMinFocal", N_("Maximum Aperture at Minimum Focal"), N_("Maximum aperture at minimum focal"),
      IfdId::fujiId, SectionId::makerTags, unsignedRational, -1, printValue},
     {0x1407, "MaxApertureAtMaxFocal", N_("Maximum Aperture at Maximum Focal"), N_("Maximum aperture at maximum focal"),
      IfdId::fujiId, SectionId::makerTags, unsignedRational, -1, printValue},
-    {0x140b, "AutoDynamicRange", N_("Auto Dynamic Range"), N_("Auto dynamic range"), IfdId::fujiId, SectionId::makerTags, unsignedShort,
-     -1, printValue},
-    {0x1422, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), IfdId::fujiId, SectionId::makerTags,
-     unsignedShort, -1, printValue},
-    {0x1425, "SzeneRecognition", N_("Scene recognition"), N_("Scene recognition"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     EXV_PRINT_TAG(fujiSceneRecognition)},
+    {0x140b, "AutoDynamicRange", N_("Auto Dynamic Range"), N_("Auto dynamic range"), IfdId::fujiId,
+     SectionId::makerTags, unsignedShort, -1, printValue},
+    {0x1422, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), IfdId::fujiId,
+     SectionId::makerTags, unsignedShort, -1, printValue},
+    {0x1425, "SzeneRecognition", N_("Scene recognition"), N_("Scene recognition"), IfdId::fujiId, SectionId::makerTags,
+     unsignedShort, -1, EXV_PRINT_TAG(fujiSceneRecognition)},
     {0x1431, "Rating", N_("Rating"), N_("Rating"), IfdId::fujiId, SectionId::makerTags, unsignedLong, -1, printValue},
-    {0x1436, "ImageGeneration", N_("Image Generation"), N_("Image generation"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
-     EXV_PRINT_TAG(fujiImageGeneration)},
-    {0x1438, "ImageNumber", N_("Image Number"), N_("Image Number"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1, printValue},
-    {0x1443, "DRangePriority", N_("D Range Priority"), N_("Dynamic range priority"), IfdId::fujiId, SectionId::makerTags, unsignedShort,
-     -1, EXV_PRINT_TAG(fujiDRangePriority)},
-    {0x1444, "DRangePriorityFixed", N_("D Range Priority Fixed"), N_("Dynamic range priority fixed"), IfdId::fujiId, SectionId::makerTags,
-     unsignedShort, -1, EXV_PRINT_TAG(fujiDRangePriorityFixed)},
-    {0x1445, "DRangePriorityAuto", N_("D Range Priority Auto"), N_("Dynamic range priority auto"), IfdId::fujiId, SectionId::makerTags,
-     unsignedShort, -1, EXV_PRINT_TAG(fujiDRangePriorityAuto)},
-    {0x4005, "FaceElementSelected", N_("Face Element Selected"), N_("Face element selected"), IfdId::fujiId, SectionId::makerTags,
+    {0x1436, "ImageGeneration", N_("Image Generation"), N_("Image generation"), IfdId::fujiId, SectionId::makerTags,
+     unsignedShort, -1, EXV_PRINT_TAG(fujiImageGeneration)},
+    {0x1438, "ImageNumber", N_("Image Number"), N_("Image Number"), IfdId::fujiId, SectionId::makerTags, unsignedShort,
+     -1, printValue},
+    {0x1443, "DRangePriority", N_("D Range Priority"), N_("Dynamic range priority"), IfdId::fujiId,
+     SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiDRangePriority)},
+    {0x1444, "DRangePriorityFixed", N_("D Range Priority Fixed"), N_("Dynamic range priority fixed"), IfdId::fujiId,
+     SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiDRangePriorityFixed)},
+    {0x1445, "DRangePriorityAuto", N_("D Range Priority Auto"), N_("Dynamic range priority auto"), IfdId::fujiId,
+     SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiDRangePriorityAuto)},
+    {0x4005, "FaceElementSelected", N_("Face Element Selected"), N_("Face element selected"), IfdId::fujiId,
+     SectionId::makerTags, asciiString, -1, printValue},
+    {0x4100, "FacesDetected", N_("Faces Detected"), N_("Faces detected"), IfdId::fujiId, SectionId::makerTags,
      asciiString, -1, printValue},
-    {0x4100, "FacesDetected", N_("Faces Detected"), N_("Faces detected"), IfdId::fujiId, SectionId::makerTags, asciiString, -1,
-     printValue},
     {0x4103, "FacePositions", N_("Face Positions"),
-     N_("Left, top, right and bottom coordinates in full-sized image for each face detected"), IfdId::fujiId, SectionId::makerTags,
-     asciiString, -1, printValue},
-    {0x4200, "NumberFaceElements", N_("Number of Face Elements"), N_("Number of face elements"), IfdId::fujiId, SectionId::makerTags,
-     asciiString, -1, printValue},
-    {0x4201, "FaceElementTypes", N_("Face Element Types"), N_("Type of every face element"), IfdId::fujiId, SectionId::makerTags,
-     asciiString, -1, printFujiFaceElementTypes},
+     N_("Left, top, right and bottom coordinates in full-sized image for each face detected"), IfdId::fujiId,
+     SectionId::makerTags, asciiString, -1, printValue},
+    {0x4200, "NumberFaceElements", N_("Number of Face Elements"), N_("Number of face elements"), IfdId::fujiId,
+     SectionId::makerTags, asciiString, -1, printValue},
+    {0x4201, "FaceElementTypes", N_("Face Element Types"), N_("Type of every face element"), IfdId::fujiId,
+     SectionId::makerTags, asciiString, -1, printFujiFaceElementTypes},
     {0x4203, "FaceElementPositions", N_("Face Element Positions"),
-     N_("Left, top, right and bottom coordinates in full-sized image for each face element)"), IfdId::fujiId, SectionId::makerTags,
-     asciiString, -1, printValue},
-    {0x4282, "FaceRecInfo", N_("Face Recognition Information"), N_("Face Recognition Information"), IfdId::fujiId, SectionId::makerTags,
-     asciiString, -1, printValue},
-    {0x8000, "FileSource", N_("File Source"), N_("File source"), IfdId::fujiId, SectionId::makerTags, asciiString, -1, printValue},
-    {0x8002, "OrderNumber", N_("Order Number"), N_("Order number"), IfdId::fujiId, SectionId::makerTags, unsignedLong, -1, printValue},
-    {0x8003, "FrameNumber", N_("Frame Number"), N_("Frame number"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1, printValue},
-    // #1402
-    {0xf000, "FujiIFD", N_("FujiIFD"), N_("Fujifilm IFD"), IfdId::fujiId, SectionId::makerTags, undefined, -1, printValue},
-    {0xf001, "RawImageFullWidth", N_("Raw Image Full Width"), N_("Raw Image Full Width"), IfdId::fujiId, SectionId::makerTags, undefined,
+     N_("Left, top, right and bottom coordinates in full-sized image for each face element)"), IfdId::fujiId,
+     SectionId::makerTags, asciiString, -1, printValue},
+    {0x4282, "FaceRecInfo", N_("Face Recognition Information"), N_("Face Recognition Information"), IfdId::fujiId,
+     SectionId::makerTags, asciiString, -1, printValue},
+    {0x8000, "FileSource", N_("File Source"), N_("File source"), IfdId::fujiId, SectionId::makerTags, asciiString, -1,
+     printValue},
+    {0x8002, "OrderNumber", N_("Order Number"), N_("Order number"), IfdId::fujiId, SectionId::makerTags, unsignedLong,
+     -1, printValue},
+    {0x8003, "FrameNumber", N_("Frame Number"), N_("Frame number"), IfdId::fujiId, SectionId::makerTags, unsignedShort,
      -1, printValue},
+    // #1402
+    {0xf000, "FujiIFD", N_("FujiIFD"), N_("Fujifilm IFD"), IfdId::fujiId, SectionId::makerTags, undefined, -1,
+     printValue},
+    {0xf001, "RawImageFullWidth", N_("Raw Image Full Width"), N_("Raw Image Full Width"), IfdId::fujiId,
+     SectionId::makerTags, undefined, -1, printValue},
     {0x1001, N_("Sharpness"), N_("Sharpness"), N_("Sharpness setting"), IfdId::fujiId, SectionId::makerTags,
      unsignedShort, -1, EXV_PRINT_TAG(fujiSharpness)},
     {0x1002, "WhiteBalance", N_("White Balance"), N_("White balance setting"), IfdId::fujiId, SectionId::makerTags,