Triage business logic refactor II - fix the service