Fix duplication of activities on edit
Activity type accessor should use activity type, not status ID
Fix handling of timetaken field