OP-6048: Fixing legacy agency handling
OP-6048: Fixing legacy agency handling

ozoneplatform/omp-marketplace,ozoneplatform/omp-marketplace,ozoneplatform/omp-marketplace,ozoneplatform/omp-marketplace,ozoneplatform/omp-marketplace