activitylog refactoring
fix activitylog