diff --git a/projects/court-case-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ConvictionIntegrationTest.kt b/projects/court-case-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ConvictionIntegrationTest.kt
index 0761f024de..64e722d7a5 100644
--- a/projects/court-case-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ConvictionIntegrationTest.kt
+++ b/projects/court-case-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ConvictionIntegrationTest.kt
@@ -95,7 +95,7 @@ internal class ConvictionIntegrationTest {
             )
         val expectedOffences = listOf(
             Offence(
-                mainOffence.id,
+                "M${mainOffence.id}",
                 mainOffence = true,
                 expectedMainOffenceDetail,
                 mainOffence.date,
@@ -107,7 +107,7 @@ internal class ConvictionIntegrationTest {
                 mainOffence.updated
             ),
             Offence(
-                additionalOffence.id,
+                "A${additionalOffence.id}",
                 mainOffence = false,
                 expectedAdditionalOffenceDetail,
                 additionalOffence.date,
diff --git a/projects/court-case-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/conviction/Conviction.kt b/projects/court-case-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/conviction/Conviction.kt
index 82f4d15fac..91190cf749 100644
--- a/projects/court-case-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/conviction/Conviction.kt
+++ b/projects/court-case-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/conviction/Conviction.kt
@@ -25,7 +25,7 @@ data class Conviction(
 )
 
 data class Offence(
-    val offenceId: Long,
+    val offenceId: String,
     val mainOffence: Boolean,
     val detail: OffenceDetail,
     val offenceDate: LocalDate?,
diff --git a/projects/court-case-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/event/entity/Event.kt b/projects/court-case-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/event/entity/Event.kt
index ba17263a17..6186707fc5 100644
--- a/projects/court-case-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/event/entity/Event.kt
+++ b/projects/court-case-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/event/entity/Event.kt
@@ -103,7 +103,7 @@ fun EventRepository.getByPersonAndEventNumber(person: Person, eventId: Long) = f
 
 @Entity
 @Immutable
-@SQLRestriction("soft_deleted = 0 and active_flag = 1")
+@SQLRestriction("soft_deleted = 0")
 @Table(name = "order_manager")
 class OrderManager(
 
diff --git a/projects/court-case-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/service/ConvictionService.kt b/projects/court-case-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/service/ConvictionService.kt
index 4f3cf1b82b..be56fbc874 100644
--- a/projects/court-case-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/service/ConvictionService.kt
+++ b/projects/court-case-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/service/ConvictionService.kt
@@ -79,7 +79,7 @@ class ConvictionService(
 
     fun MainOffence.toOffence(): Offence =
         Offence(
-            id,
+            "M$id",
             mainOffence = true,
             detail = offence.toOffenceDetail(),
             offenceDate = date,
@@ -93,7 +93,7 @@ class ConvictionService(
 
     fun AdditionalOffence.toOffence(): Offence =
         Offence(
-            id,
+            "A$id",
             mainOffence = false,
             detail = offence.toOffenceDetail(),
             offenceDate = date,
@@ -132,7 +132,7 @@ class ConvictionService(
             length,
             effectiveLength,
             lengthInDays,
-            enteredSentenceEndDate,
+            enteredSentenceEndDate ?: endDate?.toLocalDate(),
             unpaidWorkDetails?.toUnpaidWork(id),
             startDate,
             terminationDate,