diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/databases/GalleryDatabase.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/databases/GalleryDatabase.kt
index d427a6142..5eb246150 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/databases/GalleryDatabase.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/databases/GalleryDatabase.kt
@@ -60,10 +60,10 @@ abstract class GalleryDatabase : RoomDatabase() {
 
         private val MIGRATION_6_7 = object : Migration(6, 7) {
             override fun migrate(database: SupportSQLiteDatabase) {
-                database.execSQL("CREATE TABLE IF NOT EXISTS `date_takens` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `full_path` TEXT NOT NULL, `parent_path` TEXT NOT NULL, `last_fixed` INTEGER NOT NULL)")
+                database.execSQL("CREATE TABLE IF NOT EXISTS `date_takens` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `full_path` TEXT NOT NULL, `file_name` TEXT NOT NULL, `parent_path` TEXT NOT NULL, `last_fixed` INTEGER NOT NULL)")
                 database.execSQL("CREATE UNIQUE INDEX `index_date_takens_full_path` ON `date_takens` (`full_path`)")
 
-                database.execSQL("CREATE TABLE IF NOT EXISTS `favorites` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `full_path` TEXT NOT NULL, `parent_path` TEXT NOT NULL)")
+                database.execSQL("CREATE TABLE IF NOT EXISTS `favorites` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `full_path` TEXT NOT NULL, `file_name` TEXT NOT NULL, `parent_path` TEXT NOT NULL)")
                 database.execSQL("CREATE UNIQUE INDEX `index_favorites_full_path` ON `favorites` (`full_path`)")
             }
         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/DateTaken.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/DateTaken.kt
index c5b8c5b3e..a5e7e5a22 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/DateTaken.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/DateTaken.kt
@@ -11,5 +11,6 @@ import androidx.room.PrimaryKey
 data class DateTaken(
         @PrimaryKey(autoGenerate = true) var id: Int?,
         @ColumnInfo(name = "full_path") var fullPath: String,
+        @ColumnInfo(name = "file_name") var fileName: String,
         @ColumnInfo(name = "parent_path") var parentPath: String,
         @ColumnInfo(name = "last_fixed") var lastFixed: Int)
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Favorite.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Favorite.kt
index a6c3fe001..4bd0449ad 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Favorite.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Favorite.kt
@@ -9,4 +9,5 @@ import androidx.room.PrimaryKey
 data class Favorite(
         @PrimaryKey(autoGenerate = true) var id: Int?,
         @ColumnInfo(name = "full_path") var fullPath: String,
+        @ColumnInfo(name = "file_name") var fileName: String,
         @ColumnInfo(name = "parent_path") var parentPath: String)