added map for date, fixed uu and hh map to use date map