Fixes bucket end date and recursive fetch