Fix to support both image output and date field formatiing