updated data model/index to allow day/hour queries