Fix/type consolidation on work package

Cleans up some bugs that arose after tracker was renamed to type