diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/DeleteInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/DeleteInstrumentedUnitTest.kt
index 5df4ab9e..f7faed23 100644
--- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/DeleteInstrumentedUnitTest.kt
+++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/DeleteInstrumentedUnitTest.kt
@@ -3,6 +3,7 @@ package net.pokeranalytics.android.unitTests
 import net.pokeranalytics.android.components.RealmInstrumentedUnitTest
 import net.pokeranalytics.android.model.realm.Bankroll
 import net.pokeranalytics.android.model.realm.Currency
+import net.pokeranalytics.android.util.extensions.findById
 import org.junit.Assert
 import org.junit.Test
 
@@ -40,7 +41,7 @@ class DeleteInstrumentedUnitTest : RealmInstrumentedUnitTest() {
         var isValidForDelete = br1.isValidForDelete(realm)
         Assert.assertEquals(false, isValidForDelete)
 
-        realm.where(Bankroll::class.java).equalTo("id", "1").findFirst()?.let {
+        realm.findById(Bankroll::class.java, "1")?.let {
             isValidForDelete = it.isValidForDelete(realm)
             Assert.assertEquals(false, isValidForDelete)
 
diff --git a/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt b/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt
index ac462a58..0512dc2f 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt
@@ -7,6 +7,7 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.interfaces.Identifiable
 import net.pokeranalytics.android.model.realm.*
 import net.pokeranalytics.android.ui.view.Localizable
+import net.pokeranalytics.android.util.extensions.findById
 
 /**
  * An enum managing the business objects related to a realm results
@@ -55,7 +56,7 @@ enum class LiveData : Localizable {
 	fun getData(realm: Realm, primaryKey: String?): Identifiable? {
 		var proxyItem: Identifiable? = null
 		primaryKey?.let {
-			val t = realm.where(this.relatedEntity).equalTo("id", it).findFirst()
+			val t = realm.findById(this.relatedEntity, it)
 			t?.let {
 				proxyItem = t
 			}
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt
index 4ef2e5a6..9e7306b4 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt
@@ -5,10 +5,8 @@ import io.realm.Realm
 import io.realm.RealmObject
 import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
-import io.realm.kotlin.where
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.calculus.Stat
-import net.pokeranalytics.android.util.TextFormat
 import net.pokeranalytics.android.model.filter.Filterable
 import net.pokeranalytics.android.model.filter.QueryCondition
 import net.pokeranalytics.android.model.interfaces.*
@@ -17,6 +15,8 @@ import net.pokeranalytics.android.ui.graph.GraphUnderlyingEntry
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.ui.view.rowrepresentable.TransactionRow
+import net.pokeranalytics.android.util.TextFormat
+import net.pokeranalytics.android.util.extensions.findById
 import java.text.DateFormat
 import java.util.*
 import kotlin.collections.ArrayList
@@ -112,7 +112,7 @@ open class Transaction : RealmObject(), Manageable, StaticRowRepresentableDataSo
 	}
 
 	override fun alreadyExists(realm: Realm): Boolean {
-		return realm.where<Transaction>().equalTo("id", id).findFirst() != null
+		return realm.findById<Transaction>(id) != null
 	}
 
 	override fun isValidForDelete(context: Context, realm: Realm): Boolean {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
index 3a441d84..29fb9e8c 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
@@ -8,7 +8,6 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import androidx.recyclerview.widget.DiffUtil
-import io.realm.kotlin.where
 import kotlinx.android.synthetic.main.fragment_session.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.LiveData
@@ -28,6 +27,7 @@ import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentableDiffCallback
 import net.pokeranalytics.android.ui.view.SmoothScrollLinearLayoutManager
 import net.pokeranalytics.android.ui.view.rowrepresentable.SessionRow
+import net.pokeranalytics.android.util.extensions.findById
 import net.pokeranalytics.android.util.extensions.getNextMinuteInMilliseconds
 import java.util.*
 
@@ -314,7 +314,7 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate {
 	fun setData(isTournament: Boolean, sessionId: String) {
 
 		val realm = getRealm()
-		val sessionRealm = realm.where<Session>().equalTo("id", sessionId).findFirst()
+		val sessionRealm = realm.findById<Session>(sessionId)
 		if (sessionRealm != null) {
 			currentSession = sessionRealm
 			sessionHasBeenCustomized = true
@@ -328,7 +328,7 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate {
 			parentActivity?.findNearestLocation {
 				it?.let { location ->
 					realm.beginTransaction()
-					val realmLocation = realm.where<Location>().equalTo("id", location.id).findFirst()
+					val realmLocation = realm.findById<Location>(location.id)
 					FavoriteSessionFinder.copyParametersFromFavoriteSession(currentSession, realmLocation, requireContext())
 
 					currentSession.location = realmLocation