diff --git a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt
index a49e44ca3..73e27ef38 100644
--- a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt
+++ b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt
@@ -126,8 +126,12 @@ class NewsResourceDao(db: NiaDatabase, private val dispatcher: CoroutineDispatch
     suspend fun insertOrIgnoreTopicCrossRefEntities(
         newsResourceTopicCrossReferences: List<NewsResourceTopicCrossRef>,
     ) {
-        // TODO Consider removing cross references
-//        query.insertOrIgnoreNewsResourceTopicCrossRefs(newsResourceTopicCrossReferences)
+        newsResourceTopicCrossReferences.forEach {
+            query.insertOrIgnoreTopicCrossRefEntitiy(
+                news_resource_id = it.newsResourceId,
+                topic_id = it.topicId,
+            )
+        }
     }
 
     /**
diff --git a/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResource.sq b/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResource.sq
index 85cef42cc..73c687c29 100644
--- a/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResource.sq
+++ b/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResource.sq
@@ -59,7 +59,7 @@ header_image_url = excluded.header_image_url,
 publish_date = excluded.publish_date,
 type = excluded.type;
 
-insertOrIgnoreTopicCrossRefEntities:
+insertOrIgnoreTopicCrossRefEntitiy:
 INSERT OR IGNORE INTO news_resources_topics (news_resource_id, topic_id)
 VALUES (?, ?);
 
diff --git a/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourceTopicCrossRef.sq b/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourceTopicCrossRef.sq
index 2100a8a3c..d8f900b9e 100644
--- a/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourceTopicCrossRef.sq
+++ b/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourceTopicCrossRef.sq
@@ -6,6 +6,6 @@ CREATE TABLE IF NOT EXISTS news_resources_topics (
     FOREIGN KEY (topic_id) REFERENCES topic(id) ON DELETE CASCADE
 );
 
-CREATE INDEX idx_news_resource_id ON news_resource_topic(news_resource_id);
+CREATE INDEX idx_news_resource_id ON news_resources_topics(news_resource_id);
 
-CREATE INDEX idx_topic_id ON news_resource_topic(topic_id);
+CREATE INDEX idx_topic_id ON news_resources_topics(topic_id);