INTEG-123 | Activity type improvement - Fix some bugs reported on issue