diff --git a/src/main/java/org/mtransit/commons/FeatureFlags.kt b/src/main/java/org/mtransit/commons/FeatureFlags.kt
index f5bd6da..336870f 100644
--- a/src/main/java/org/mtransit/commons/FeatureFlags.kt
+++ b/src/main/java/org/mtransit/commons/FeatureFlags.kt
@@ -1,6 +1,6 @@
 package org.mtransit.commons
 
-@Suppress("unused", "SimplifyBooleanWithConstants")
+@Suppress("unused", "KotlinConstantConditions", "SimplifyBooleanWithConstants")
 object FeatureFlags {
     // @formatter:off
 
@@ -62,5 +62,8 @@ object FeatureFlags {
 
     // endregion Schedule
 
+    // const val F_USE_TRIP_IS_FOR_SERVICE_UPDATES = false
+    const val F_USE_TRIP_IS_FOR_SERVICE_UPDATES = true // WIP
+
     // @formatter:on
 }
diff --git a/src/main/java/org/mtransit/commons/sql/SQLUtils.kt b/src/main/java/org/mtransit/commons/sql/SQLUtils.kt
index de85f85..a2908fa 100644
--- a/src/main/java/org/mtransit/commons/sql/SQLUtils.kt
+++ b/src/main/java/org/mtransit/commons/sql/SQLUtils.kt
@@ -107,15 +107,16 @@ object SQLUtils {
     }
 
     @JvmStatic
-    fun getWhereGroup(andOr: String, vararg whereClauses: String): String {
-        val sb = StringBuilder(P1)
+    fun getWhereGroup(andOr: String, vararg whereClauses: String) = buildString {
         for (whereClause in whereClauses) {
-            if (sb.isNotEmpty()) {
-                sb.append(andOr)
+            if (isEmpty()) {
+                append(P1)
+            } else {
+                append(andOr)
             }
-            sb.append(whereClause)
+            append(whereClause)
         }
-        return sb.append(P2).toString()
+        if (isNotEmpty()) append(P2)
     }
 
     @JvmStatic