Modified the format/type enriching according to ticket #3793.