Fixed update commitment category and calendar issues