DTGOV-168 WorkflowQueryService code cleaning