diff --git a/HDF5Examples/FORTRAN/H5D/h5ex_d_checksum.F90 b/HDF5Examples/FORTRAN/H5D/h5ex_d_checksum.F90
index 863a9049166..cab742b7d1a 100644
--- a/HDF5Examples/FORTRAN/H5D/h5ex_d_checksum.F90
+++ b/HDF5Examples/FORTRAN/H5D/h5ex_d_checksum.F90
@@ -120,15 +120,17 @@ PROGRAM main
   !
   nelmts = 0
   CALL H5Pget_filter_f(dcpl, 0, flags, nelmts, cd_values, MaxChrLen, name, filter_id, hdferr)
-  WRITE(*,'("Filter type is: ")', ADVANCE='NO')
+  WRITE(*,'(A,1X)', ADVANCE='NO') "Filter type is:"
   IF(filter_id.EQ.H5Z_FILTER_DEFLATE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_DEFLATE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_DEFLATE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SHUFFLE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SHUFFLE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SHUFFLE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_FLETCHER32_F)THEN
-     WRITE(*,'(" H5Z_FILTER_FLETCHER32_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_FLETCHER32_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SZIP_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SZIP_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SZIP_F"
+  ELSE
+     WRITE(*,'(A)') "UNKNOWN"
   ENDIF
   !
   ! Read the data using the default properties.
diff --git a/HDF5Examples/FORTRAN/H5D/h5ex_d_gzip.F90 b/HDF5Examples/FORTRAN/H5D/h5ex_d_gzip.F90
index 722ce79d87e..7e7b6b5a005 100644
--- a/HDF5Examples/FORTRAN/H5D/h5ex_d_gzip.F90
+++ b/HDF5Examples/FORTRAN/H5D/h5ex_d_gzip.F90
@@ -118,15 +118,17 @@ PROGRAM main
   !
   nelmts = 1
   CALL H5Pget_filter_f(dcpl, 0, flags, nelmts, cd_values, MaxChrLen, name, filter_id, hdferr)
-  WRITE(*,'("Filter type is: ")', ADVANCE='NO')
+  WRITE(*,'(A,1X)', ADVANCE='NO') "Filter type is:"
   IF(filter_id.EQ.H5Z_FILTER_DEFLATE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_DEFLATE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_DEFLATE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SHUFFLE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SHUFFLE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SHUFFLE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_FLETCHER32_F)THEN
-     WRITE(*,'(" H5Z_FILTER_FLETCHER32_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_FLETCHER32_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SZIP_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SZIP_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SZIP_F"
+  ELSE
+     WRITE(*,'(A)') "UNKNOWN"
   ENDIF
   !
   ! Read the data using the default properties.
diff --git a/HDF5Examples/FORTRAN/H5D/h5ex_d_nbit.F90 b/HDF5Examples/FORTRAN/H5D/h5ex_d_nbit.F90
index 2c5d7ba131e..636898c1ce9 100644
--- a/HDF5Examples/FORTRAN/H5D/h5ex_d_nbit.F90
+++ b/HDF5Examples/FORTRAN/H5D/h5ex_d_nbit.F90
@@ -125,17 +125,19 @@ PROGRAM main
   ! first filter because we know that we only added one filter.
   !
   CALL H5Pget_filter_f(dcpl, 0, flags, nelmts, cd_values, INT(MaxChrLen, SIZE_T), name, filter_id, hdferr)
-  WRITE(*,'("Filter type is: ")', ADVANCE='NO')
+  WRITE(*,'(A,1X)', ADVANCE='NO') "Filter type is:"
   IF(filter_id.EQ.H5Z_FILTER_DEFLATE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_DEFLATE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_DEFLATE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SHUFFLE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SHUFFLE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SHUFFLE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_FLETCHER32_F)THEN
-     WRITE(*,'(" H5Z_FILTER_FLETCHER32_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_FLETCHER32_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SZIP_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SZIP_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SZIP_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_NBIT_F)THEN
-     WRITE(*,'(" H5Z_FILTER_NBIT_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_NBIT_F"
+  ELSE
+     WRITE(*,'(A)') "UNKNOWN"
   ENDIF
   !
   ! Read the data using the default properties.
diff --git a/HDF5Examples/FORTRAN/H5D/h5ex_d_soint.F90 b/HDF5Examples/FORTRAN/H5D/h5ex_d_soint.F90
index b04e163f371..e3bcc9f6859 100644
--- a/HDF5Examples/FORTRAN/H5D/h5ex_d_soint.F90
+++ b/HDF5Examples/FORTRAN/H5D/h5ex_d_soint.F90
@@ -133,19 +133,21 @@ PROGRAM main
   !
   nelmts = 1
   CALL H5Pget_filter_f(dcpl, 0, flags, nelmts, cd_values, INT(MaxChrLen, SIZE_T), name, filter_id, hdferr)
-  WRITE(*,'("Filter type is: ")', ADVANCE='NO')
+  WRITE(*,'(A,1X)', ADVANCE='NO') "Filter type is:"
   IF(filter_id.EQ.H5Z_FILTER_DEFLATE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_DEFLATE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_DEFLATE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SHUFFLE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SHUFFLE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SHUFFLE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_FLETCHER32_F)THEN
-     WRITE(*,'(" H5Z_FILTER_FLETCHER32_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_FLETCHER32_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SZIP_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SZIP_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SZIP_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_NBIT_F)THEN
-     WRITE(*,'(" H5Z_FILTER_NBIT_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_NBIT_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SCALEOFFSET_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SCALEOFFSET_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SCALEOFFSET_F"
+  ELSE
+     WRITE(*,'(A)') "UNKNOWN"
   ENDIF
   !
   ! Read the data using the default properties.
diff --git a/HDF5Examples/FORTRAN/H5D/h5ex_d_szip.F90 b/HDF5Examples/FORTRAN/H5D/h5ex_d_szip.F90
index 86e1b3dcf5f..fdd6ecf29d2 100644
--- a/HDF5Examples/FORTRAN/H5D/h5ex_d_szip.F90
+++ b/HDF5Examples/FORTRAN/H5D/h5ex_d_szip.F90
@@ -119,20 +119,22 @@ PROGRAM main
   
   nelmts = 1
   CALL H5Pget_filter_f(dcpl, 0, flags, nelmts, cd_values, INT(MaxChrLen,SIZE_T), name, filter_id, hdferr)
-  WRITE(*,'("Filter type is: ")', ADVANCE='NO')
+  WRITE(*,'(A,1X)', ADVANCE='NO') "Filter type is:"
   IF(filter_id.EQ.H5Z_FILTER_DEFLATE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_DEFLATE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_DEFLATE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SHUFFLE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SHUFFLE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SHUFFLE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_FLETCHER32_F)THEN
-     WRITE(*,'(" H5Z_FILTER_FLETCHER32_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_FLETCHER32_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SZIP_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SZIP_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SZIP_F"
 ! DEFINED ONLY IN F2003 hdf5 branch
 !  ELSE IF(filter_id.EQ.H5Z_FILTER_NBIT_F)THEN
 !     WRITE(*,'(" H5Z_FILTER_NBIT_F")')
 !  ELSE IF(filter_id.EQ.H5Z_FILTER_SCALEOFFSET_F)THEN
 !     WRITE(*,'(" H5Z_FILTER_SCALEOFFSET_F")')
+  ELSE
+     WRITE(*,'(A)') "UNKNOWN"
   ENDIF
   !
   ! Read the data using the default properties.
diff --git a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_checksum.tst b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_checksum.tst
index 01ed8661b8c..d2690e3edac 100644
--- a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_checksum.tst
+++ b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_checksum.tst
@@ -1,2 +1,2 @@
-Filter type is:  H5Z_FILTER_FLETCHER32_F
+Filter type is: H5Z_FILTER_FLETCHER32_F
 Maximum value in DS1 is:       1984
diff --git a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_gzip.tst b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_gzip.tst
index 9efcd78a516..6fbaba15ce9 100644
--- a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_gzip.tst
+++ b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_gzip.tst
@@ -1,2 +1,2 @@
-Filter type is:  H5Z_FILTER_DEFLATE_F
+Filter type is: H5Z_FILTER_DEFLATE_F
 Maximum value in DS1 is:       1890
diff --git a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_nbit.tst b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_nbit.tst
index 90f7a67bb1b..49c46ba7a7f 100644
--- a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_nbit.tst
+++ b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_nbit.tst
@@ -1,2 +1,2 @@
-Filter type is:  H5Z_FILTER_NBIT_F
+Filter type is: H5Z_FILTER_NBIT_F
 Maximum value in DS1 is:       1890
diff --git a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_soint.tst b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_soint.tst
index ddf8b307ad3..d3dad134ef4 100644
--- a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_soint.tst
+++ b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_soint.tst
@@ -1,5 +1,5 @@
 Maximum value in write buffer is: 1890
 Minimum value in write buffer is:  -63
-Filter type is:  H5Z_FILTER_SCALEOFFSET_F
+Filter type is: H5Z_FILTER_SCALEOFFSET_F
 Maximum value in DS1 is: 1890
 Minimum value in DS1 is:  -63
diff --git a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_szip.tst b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_szip.tst
index 8f6ba90206d..bfd93d463fc 100644
--- a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_szip.tst
+++ b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_szip.tst
@@ -1,2 +1,2 @@
-Filter type is:  H5Z_FILTER_SZIP_F
+Filter type is: H5Z_FILTER_SZIP_F
 Maximum value in DS1 is:       1890