CLC-1017 - Adding a task doesn't put it in the right bucket
https://jira.media.berkeley.edu/jira/browse/CLC-1017
Merge pull request #481 from christianv/CLC-1017

CLC-1017 - Adding a task doesn't put it in the right bucket