Updated more logic to make output data structure to be consistent bulletin html files over years