Fix issue with enqueuing timing out by splitting up years