diff --git a/sdk/src/main/java/ch/opentransportdata/ojp/data/dto/converter/FareClassConverter.kt b/sdk/src/main/java/ch/opentransportdata/ojp/data/dto/converter/FareClassConverter.kt
index 76ac778..6b0f81e 100644
--- a/sdk/src/main/java/ch/opentransportdata/ojp/data/dto/converter/FareClassConverter.kt
+++ b/sdk/src/main/java/ch/opentransportdata/ojp/data/dto/converter/FareClassConverter.kt
@@ -10,10 +10,10 @@ import com.tickaroo.tikxml.TypeConverter
 internal class FareClassConverter : TypeConverter<FareClass> {
 
     override fun read(ojpValue: String): FareClass {
-        return when (ojpValue.trim()) {
+        return when (ojpValue) {
             "unknown" -> FareClass.UNKNOWN
             "firstClass" -> FareClass.FIRST_CLASS
-            "secondClass" -> FareClass.SECOND_CLASS
+            "secondClass " -> FareClass.SECOND_CLASS
             else -> FareClass.UNKNOWN
         }
     }
@@ -22,7 +22,7 @@ internal class FareClassConverter : TypeConverter<FareClass> {
         return when (type) {
             FareClass.UNKNOWN -> "unknown"
             FareClass.FIRST_CLASS -> "firstClass"
-            FareClass.SECOND_CLASS -> "secondClass"
+            FareClass.SECOND_CLASS -> "secondClass "
         }
     }
 }
\ No newline at end of file
diff --git a/sdk/src/main/java/ch/opentransportdata/ojp/data/dto/response/tir/LegDto.kt b/sdk/src/main/java/ch/opentransportdata/ojp/data/dto/response/tir/LegDto.kt
index 87f4051..50704ff 100644
--- a/sdk/src/main/java/ch/opentransportdata/ojp/data/dto/response/tir/LegDto.kt
+++ b/sdk/src/main/java/ch/opentransportdata/ojp/data/dto/response/tir/LegDto.kt
@@ -6,6 +6,7 @@ import ch.opentransportdata.ojp.data.dto.response.tir.leg.AbstractLegType
 import ch.opentransportdata.ojp.data.dto.response.tir.leg.ContinuousLegDto
 import ch.opentransportdata.ojp.data.dto.response.tir.leg.TimedLegDto
 import ch.opentransportdata.ojp.data.dto.response.tir.leg.TransferLegDto
+import ch.opentransportdata.ojp.data.dto.response.tir.leg.minimalCopy
 import ch.opentransportdata.ojp.data.dto.response.tir.leg.replaceWithParentRef
 import com.tickaroo.tikxml.annotation.Element
 import com.tickaroo.tikxml.annotation.PropertyElement
@@ -39,9 +40,9 @@ fun LegDto.minimalCopy(): LegDto {
     return LegDto(
         id = id,
         duration = duration,
-        timedLeg = timedLeg,
+        timedLeg = timedLeg?.minimalCopy(),
         transferLeg = transferLeg,
-        continuousLeg = continuousLeg
+        continuousLeg = continuousLeg?.minimalCopy()
     )
 }
 
diff --git a/sdk/src/main/java/ch/opentransportdata/ojp/data/remote/trip/RemoteTripDataSourceImpl.kt b/sdk/src/main/java/ch/opentransportdata/ojp/data/remote/trip/RemoteTripDataSourceImpl.kt
index 51ec384..edfac5a 100644
--- a/sdk/src/main/java/ch/opentransportdata/ojp/data/remote/trip/RemoteTripDataSourceImpl.kt
+++ b/sdk/src/main/java/ch/opentransportdata/ojp/data/remote/trip/RemoteTripDataSourceImpl.kt
@@ -15,6 +15,7 @@ import ch.opentransportdata.ojp.data.dto.request.tir.TripVia
 import ch.opentransportdata.ojp.data.dto.request.trr.TripRefineParamDto
 import ch.opentransportdata.ojp.data.dto.request.trr.TripRefineRequestDto
 import ch.opentransportdata.ojp.data.dto.response.tir.TripResultDto
+import ch.opentransportdata.ojp.data.dto.response.tir.minimalTripResult
 import ch.opentransportdata.ojp.data.remote.OjpService
 import ch.opentransportdata.ojp.domain.model.LanguageCode
 import ch.opentransportdata.ojp.domain.model.TripParams
@@ -93,7 +94,7 @@ internal class RemoteTripDataSourceImpl(
                     tripRefineRequest = TripRefineRequestDto(
                         requestTimestamp = requestTime,
                         params = params?.mapToBackendParams(),
-                        result = tripResultDto,
+                        result = tripResultDto.minimalTripResult,
                     )
                 )
             )