diff --git a/spec/search/becca_mocking.ts b/spec/search/becca_mocking.ts
index c31631ce5..eaae2741f 100644
--- a/spec/search/becca_mocking.ts
+++ b/spec/search/becca_mocking.ts
@@ -4,7 +4,7 @@ import BAttribute from "../../src/becca/entities/battribute.js";
 import becca from "../../src/becca/becca.js";
 import randtoken from "rand-token";
 import SearchResult from "../../src/services/search/search_result.js";
-import { NoteType } from "../../src/becca/entities/rows";
+import { NoteType } from "../../src/becca/entities/rows.js";
 randtoken.generator({ source: "crypto" });
 
 function findNoteByTitle(
diff --git a/src/becca/becca-interface.ts b/src/becca/becca-interface.ts
index 562ec85db..f719a9f02 100644
--- a/src/becca/becca-interface.ts
+++ b/src/becca/becca-interface.ts
@@ -8,7 +8,7 @@ import BAttribute from "./entities/battribute.js";
 import BBranch from "./entities/bbranch.js";
 import BRevision from "./entities/brevision.js";
 import BAttachment from "./entities/battachment.js";
-import { AttachmentRow, RevisionRow } from './entities/rows';
+import { AttachmentRow, RevisionRow } from './entities/rows.js';
 import BBlob from "./entities/bblob.js";
 import BRecentNote from "./entities/brecent_note.js";
 import AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
diff --git a/src/becca/becca_loader.ts b/src/becca/becca_loader.ts
index 1bfab31da..041bdccbd 100644
--- a/src/becca/becca_loader.ts
+++ b/src/becca/becca_loader.ts
@@ -12,7 +12,7 @@ import BOption from "./entities/boption.js";
 import BEtapiToken from "./entities/betapi_token.js";
 import cls from "../services/cls.js";
 import entityConstructor from "../becca/entity_constructor.js";
-import { AttributeRow, BranchRow, EtapiTokenRow, NoteRow, OptionRow } from './entities/rows';
+import { AttributeRow, BranchRow, EtapiTokenRow, NoteRow, OptionRow } from './entities/rows.js';
 import AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
 import options_init from "../services/options_init.js";
 import ws from "../services/ws.js";
diff --git a/src/becca/entities/battachment.ts b/src/becca/entities/battachment.ts
index bef20acea..83b76bec8 100644
--- a/src/becca/entities/battachment.ts
+++ b/src/becca/entities/battachment.ts
@@ -6,7 +6,7 @@ import AbstractBeccaEntity from "./abstract_becca_entity.js";
 import sql from "../../services/sql.js";
 import protectedSessionService from "../../services/protected_session.js";
 import log from "../../services/log.js";
-import { AttachmentRow } from './rows';
+import { AttachmentRow } from './rows.js';
 import BNote from "./bnote.js";
 import BBranch from "./bbranch.js";
 import noteService from "../../services/notes.js";
diff --git a/src/becca/entities/battribute.ts b/src/becca/entities/battribute.ts
index c0ba201bc..97df7b056 100644
--- a/src/becca/entities/battribute.ts
+++ b/src/becca/entities/battribute.ts
@@ -5,7 +5,7 @@ import AbstractBeccaEntity from "./abstract_becca_entity.js";
 import dateUtils from "../../services/date_utils.js";
 import promotedAttributeDefinitionParser from "../../services/promoted_attribute_definition_parser.js";
 import sanitizeAttributeName from "../../services/sanitize_attribute_name.js";
-import { AttributeRow, AttributeType } from './rows';
+import { AttributeRow, AttributeType } from './rows.js';
 
 interface SavingOpts {
     skipValidation?: boolean;
diff --git a/src/becca/entities/bblob.ts b/src/becca/entities/bblob.ts
index c02d1f1b7..d406831f0 100644
--- a/src/becca/entities/bblob.ts
+++ b/src/becca/entities/bblob.ts
@@ -1,5 +1,5 @@
 import AbstractBeccaEntity from "./abstract_becca_entity.js";
-import { BlobRow } from "./rows";
+import { BlobRow } from "./rows.js";
 
 // TODO: Why this does not extend the abstract becca?
 class BBlob extends AbstractBeccaEntity<BBlob> {
diff --git a/src/becca/entities/bbranch.ts b/src/becca/entities/bbranch.ts
index b0222f115..6fc2c6ece 100644
--- a/src/becca/entities/bbranch.ts
+++ b/src/becca/entities/bbranch.ts
@@ -7,7 +7,7 @@ import utils from "../../services/utils.js";
 import TaskContext from "../../services/task_context.js";
 import cls from "../../services/cls.js";
 import log from "../../services/log.js";
-import { BranchRow } from './rows';
+import { BranchRow } from './rows.js';
 import handlers from "../../services/handlers.js";
 
 /**
diff --git a/src/becca/entities/betapi_token.ts b/src/becca/entities/betapi_token.ts
index dd3f9f0c9..bfd4383e3 100644
--- a/src/becca/entities/betapi_token.ts
+++ b/src/becca/entities/betapi_token.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import { EtapiTokenRow } from "./rows";
+import { EtapiTokenRow } from "./rows.js";
 
 import dateUtils from "../../services/date_utils.js";
 import AbstractBeccaEntity from "./abstract_becca_entity.js";
diff --git a/src/becca/entities/bnote.ts b/src/becca/entities/bnote.ts
index b6e05fb10..07204245e 100644
--- a/src/becca/entities/bnote.ts
+++ b/src/becca/entities/bnote.ts
@@ -12,7 +12,7 @@ import TaskContext from "../../services/task_context.js";
 import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc";
 import eventService from "../../services/events.js";
-import { AttachmentRow, AttributeType, NoteRow, NoteType, RevisionRow } from './rows';
+import { AttachmentRow, AttributeType, NoteRow, NoteType, RevisionRow } from './rows.js';
 import BBranch from "./bbranch.js";
 import BAttribute from "./battribute.js";
 import { NotePojo } from '../becca-interface';
diff --git a/src/becca/entities/boption.ts b/src/becca/entities/boption.ts
index 12c7ceff8..4c577cdd6 100644
--- a/src/becca/entities/boption.ts
+++ b/src/becca/entities/boption.ts
@@ -2,7 +2,7 @@
 
 import dateUtils from "../../services/date_utils.js";
 import AbstractBeccaEntity from "./abstract_becca_entity.js";
-import { OptionRow } from './rows';
+import { OptionRow } from './rows.js';
 
 /**
  * Option represents a name-value pair, either directly configurable by the user or some system property.
diff --git a/src/becca/entities/brecent_note.ts b/src/becca/entities/brecent_note.ts
index 9ed77bc44..414addfad 100644
--- a/src/becca/entities/brecent_note.ts
+++ b/src/becca/entities/brecent_note.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import { RecentNoteRow } from "./rows";
+import { RecentNoteRow } from "./rows.js";
 
 import dateUtils from "../../services/date_utils.js";
 import AbstractBeccaEntity from "./abstract_becca_entity.js";
diff --git a/src/becca/entities/brevision.ts b/src/becca/entities/brevision.ts
index 43c7e1a3e..4aa64fd61 100644
--- a/src/becca/entities/brevision.ts
+++ b/src/becca/entities/brevision.ts
@@ -7,7 +7,7 @@ import becca from "../becca.js";
 import AbstractBeccaEntity from "./abstract_becca_entity.js";
 import sql from "../../services/sql.js";
 import BAttachment from "./battachment.js";
-import { AttachmentRow, RevisionRow } from './rows';
+import { AttachmentRow, RevisionRow } from './rows.js';
 import eraseService from "../../services/erase.js";
 
 interface ContentOpts {
diff --git a/src/etapi/attachments.ts b/src/etapi/attachments.ts
index 280672b01..cebd3f98c 100644
--- a/src/etapi/attachments.ts
+++ b/src/etapi/attachments.ts
@@ -4,7 +4,7 @@ import mappers from "./mappers.js";
 import v from "./validators.js";
 import utils from "../services/utils.js";
 import { Router } from 'express';
-import { AttachmentRow } from '../becca/entities/rows';
+import { AttachmentRow } from '../becca/entities/rows.js';
 import { ValidatorMap } from './etapi-interface';
 
 function register(router: Router) {
diff --git a/src/etapi/attributes.ts b/src/etapi/attributes.ts
index 9ca4918dd..637de157b 100644
--- a/src/etapi/attributes.ts
+++ b/src/etapi/attributes.ts
@@ -4,7 +4,7 @@ import mappers from "./mappers.js";
 import attributeService from "../services/attributes.js";
 import v from "./validators.js";
 import { Router } from 'express';
-import { AttributeRow } from '../becca/entities/rows';
+import { AttributeRow } from '../becca/entities/rows.js';
 import { ValidatorMap } from './etapi-interface';
 
 function register(router: Router) {
diff --git a/src/etapi/branches.ts b/src/etapi/branches.ts
index 66dea473f..8a6b61e2f 100644
--- a/src/etapi/branches.ts
+++ b/src/etapi/branches.ts
@@ -6,7 +6,7 @@ import mappers from "./mappers.js";
 import BBranch from "../becca/entities/bbranch.js";
 import entityChangesService from "../services/entity_changes.js";
 import v from "./validators.js";
-import { BranchRow } from "../becca/entities/rows";
+import { BranchRow } from "../becca/entities/rows.js";
 
 function register(router: Router) {
     eu.route(router, 'get', '/etapi/branches/:branchId', (req, res, next) => {
diff --git a/src/routes/api/notes.ts b/src/routes/api/notes.ts
index 0496886a2..c47aad91c 100644
--- a/src/routes/api/notes.ts
+++ b/src/routes/api/notes.ts
@@ -12,7 +12,7 @@ import ValidationError from "../../errors/validation_error.js";
 import blobService from "../../services/blob.js";
 import { Request } from 'express';
 import BBranch from "../../becca/entities/bbranch.js";
-import { AttributeRow } from '../../becca/entities/rows';
+import { AttributeRow } from '../../becca/entities/rows.js';
 
 function getNote(req: Request) {
     return becca.getNoteOrThrow(req.params.noteId);
diff --git a/src/routes/api/recent_changes.ts b/src/routes/api/recent_changes.ts
index 7962c8026..788ae17e0 100644
--- a/src/routes/api/recent_changes.ts
+++ b/src/routes/api/recent_changes.ts
@@ -5,7 +5,7 @@ import protectedSessionService from "../../services/protected_session.js";
 import noteService from "../../services/notes.js";
 import becca from "../../becca/becca.js";
 import { Request } from 'express';
-import { RevisionRow } from '../../becca/entities/rows';
+import { RevisionRow } from '../../becca/entities/rows.js';
 
 interface RecentChangeRow {
     noteId: string;
diff --git a/src/services/api-interface.ts b/src/services/api-interface.ts
index 30c248693..a474b09d5 100644
--- a/src/services/api-interface.ts
+++ b/src/services/api-interface.ts
@@ -1,4 +1,4 @@
-import { OptionRow } from "../becca/entities/rows";
+import { OptionRow } from "../becca/entities/rows.js";
 
 /**
  * Response for /api/setup/status.
diff --git a/src/services/attribute_formatter.ts b/src/services/attribute_formatter.ts
index cdc642878..31112be36 100644
--- a/src/services/attribute_formatter.ts
+++ b/src/services/attribute_formatter.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import { AttributeRow } from "../becca/entities/rows";
+import { AttributeRow } from "../becca/entities/rows.js";
 
 function formatAttrForSearch(attr: AttributeRow, searchWithValue: boolean) {
     let searchStr = '';
diff --git a/src/services/attributes.ts b/src/services/attributes.ts
index 960482c4c..8f17249e2 100644
--- a/src/services/attributes.ts
+++ b/src/services/attributes.ts
@@ -7,7 +7,7 @@ import BAttribute from "../becca/entities/battribute.js";
 import attributeFormatter from "./attribute_formatter.js";
 import BUILTIN_ATTRIBUTES from "./builtin_attributes.js";
 import BNote from "../becca/entities/bnote.js";
-import { AttributeRow } from '../becca/entities/rows';
+import { AttributeRow } from '../becca/entities/rows.js';
 
 const ATTRIBUTE_TYPES = ['label', 'relation'];
 
diff --git a/src/services/backend_script_api.ts b/src/services/backend_script_api.ts
index 6d31a31b0..c530f0527 100644
--- a/src/services/backend_script_api.ts
+++ b/src/services/backend_script_api.ts
@@ -30,7 +30,7 @@ import BAttachment from "../becca/entities/battachment.js";
 import BRevision from "../becca/entities/brevision.js";
 import BEtapiToken from "../becca/entities/betapi_token.js";
 import BOption from "../becca/entities/boption.js";
-import { AttributeRow, AttributeType, NoteType } from '../becca/entities/rows';
+import { AttributeRow, AttributeType, NoteType } from '../becca/entities/rows.js';
 import Becca from '../becca/becca-interface';
 import { NoteParams } from './note-interface';
 import { ApiParams } from './backend_script_api_interface';
diff --git a/src/services/consistency_checks.ts b/src/services/consistency_checks.ts
index a36b4490d..c928f6f12 100644
--- a/src/services/consistency_checks.ts
+++ b/src/services/consistency_checks.ts
@@ -14,7 +14,7 @@ import utils from "../services/utils.js";
 import eraseService from "../services/erase.js";
 import sanitizeAttributeName from "./sanitize_attribute_name.js";
 import noteTypesService from "../services/note_types.js";
-import { BranchRow } from '../becca/entities/rows';
+import { BranchRow } from '../becca/entities/rows.js';
 import { EntityChange } from './entity_changes_interface';
 import becca_loader from "../becca/becca_loader.js";
 const noteTypes = noteTypesService.getNoteTypeNames();
diff --git a/src/services/hidden_subtree.ts b/src/services/hidden_subtree.ts
index f9979e734..563da456f 100644
--- a/src/services/hidden_subtree.ts
+++ b/src/services/hidden_subtree.ts
@@ -1,5 +1,5 @@
 import BAttribute from "../becca/entities/battribute.js";
-import { AttributeType, NoteType } from "../becca/entities/rows";
+import { AttributeType, NoteType } from "../becca/entities/rows.js";
 
 import becca from "../becca/becca.js";
 import noteService from "./notes.js";
diff --git a/src/services/import/zip.ts b/src/services/import/zip.ts
index 6855760af..58aa8e994 100644
--- a/src/services/import/zip.ts
+++ b/src/services/import/zip.ts
@@ -20,7 +20,7 @@ import BNote from "../../becca/entities/bnote.js";
 import NoteMeta from "../meta/note_meta.js";
 import AttributeMeta from "../meta/attribute_meta.js";
 import { Stream } from 'stream';
-import { ALLOWED_NOTE_TYPES, NoteType } from '../../becca/entities/rows';
+import { ALLOWED_NOTE_TYPES, NoteType } from '../../becca/entities/rows.js';
 
 interface MetaFile {
     files: NoteMeta[]
diff --git a/src/services/meta/attribute_meta.ts b/src/services/meta/attribute_meta.ts
index c2f8764aa..648dc1c1d 100644
--- a/src/services/meta/attribute_meta.ts
+++ b/src/services/meta/attribute_meta.ts
@@ -1,4 +1,4 @@
-import { AttributeType } from "../../becca/entities/rows";
+import { AttributeType } from "../../becca/entities/rows.js";
 
 interface AttributeMeta {
     noteId?: string;
diff --git a/src/services/note-interface.ts b/src/services/note-interface.ts
index 2cfa0b86a..194085bdb 100644
--- a/src/services/note-interface.ts
+++ b/src/services/note-interface.ts
@@ -1,4 +1,4 @@
-import { NoteType } from "../becca/entities/rows";
+import { NoteType } from "../becca/entities/rows.js";
 
 export interface NoteParams {
     /** optionally can force specific noteId */
diff --git a/src/services/notes.ts b/src/services/notes.ts
index 20df9948a..fcebaf967 100644
--- a/src/services/notes.ts
+++ b/src/services/notes.ts
@@ -23,7 +23,7 @@ import noteTypesService from "./note_types.js";
 import fs from "fs";
 import ws from "./ws.js";
 import html2plaintext from "html2plaintext";
-import { AttachmentRow, AttributeRow, BranchRow, NoteRow, NoteType } from '../becca/entities/rows';
+import { AttachmentRow, AttributeRow, BranchRow, NoteRow, NoteType } from '../becca/entities/rows.js';
 import TaskContext from "./task_context.js";
 import { NoteParams } from './note-interface';
 import imageService from "./image.js";
diff --git a/src/services/options.ts b/src/services/options.ts
index bd9b289ad..a8b7500fc 100644
--- a/src/services/options.ts
+++ b/src/services/options.ts
@@ -1,6 +1,6 @@
 import becca from "../becca/becca.js";
 import BOption from "../becca/entities/boption.js";
-import { OptionRow } from '../becca/entities/rows';
+import { OptionRow } from '../becca/entities/rows.js';
 import sql from "./sql.js";
 
 function getOptionOrNull(name: string): string | null {
diff --git a/src/services/search/expressions/note_content_fulltext.ts b/src/services/search/expressions/note_content_fulltext.ts
index 30f7b40f1..79d9b5376 100644
--- a/src/services/search/expressions/note_content_fulltext.ts
+++ b/src/services/search/expressions/note_content_fulltext.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import { NoteRow } from "../../../becca/entities/rows";
+import { NoteRow } from "../../../becca/entities/rows.js";
 import SearchContext from "../search_context.js";
 
 import Expression from "./expression.js";
diff --git a/src/services/sql_init.ts b/src/services/sql_init.ts
index 2a4d96715..a93750476 100644
--- a/src/services/sql_init.ts
+++ b/src/services/sql_init.ts
@@ -10,7 +10,7 @@ import TaskContext from "./task_context.js";
 import migrationService from "./migration.js";
 import cls from "./cls.js";
 import config from "./config.js";
-import { OptionRow } from '../becca/entities/rows';
+import { OptionRow } from '../becca/entities/rows.js';
 import optionsInitService from "./options_init.js";
 import BNote from "../becca/entities/bnote.js";
 import BBranch from "../becca/entities/bbranch.js";
diff --git a/src/share/shaca/entities/sattachment.ts b/src/share/shaca/entities/sattachment.ts
index 7ac9c3847..57d01298a 100644
--- a/src/share/shaca/entities/sattachment.ts
+++ b/src/share/shaca/entities/sattachment.ts
@@ -5,7 +5,7 @@ import utils from "../../../services/utils.js";
 import AbstractShacaEntity from "./abstract_shaca_entity.js";
 import SNote from "./snote.js";
 import { Blob } from '../../../services/blob-interface';
-import { SAttachmentRow } from './rows';
+import { SAttachmentRow } from './rows.js';
 
 class SAttachment extends AbstractShacaEntity {
     private attachmentId: string;
diff --git a/src/share/shaca/entities/sattribute.ts b/src/share/shaca/entities/sattribute.ts
index 189d9e6a6..c29f5147c 100644
--- a/src/share/shaca/entities/sattribute.ts
+++ b/src/share/shaca/entities/sattribute.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import AbstractShacaEntity from "./abstract_shaca_entity";
-import { SAttributeRow } from "./rows";
+import { SAttributeRow } from "./rows.js";
 import SNote from "./snote.js";
 
 class SAttribute extends AbstractShacaEntity {
diff --git a/src/share/shaca/entities/sbranch.ts b/src/share/shaca/entities/sbranch.ts
index 0f2080603..cb71ed780 100644
--- a/src/share/shaca/entities/sbranch.ts
+++ b/src/share/shaca/entities/sbranch.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import AbstractShacaEntity from "./abstract_shaca_entity.js";
-import { SBranchRow } from './rows';
+import { SBranchRow } from './rows.js';
 import SNote from "./snote.js";
 
 class SBranch extends AbstractShacaEntity {
diff --git a/src/share/shaca/entities/snote.ts b/src/share/shaca/entities/snote.ts
index 755404b40..29dc1ea95 100644
--- a/src/share/shaca/entities/snote.ts
+++ b/src/share/shaca/entities/snote.ts
@@ -8,7 +8,7 @@ import { Blob } from '../../../services/blob-interface';
 import SAttachment from "./sattachment.js";
 import SAttribute from "./sattribute.js";
 import SBranch from "./sbranch.js";
-import { SNoteRow } from './rows';
+import { SNoteRow } from './rows.js';
 
 const LABEL = 'label';
 const RELATION = 'relation';
diff --git a/src/share/shaca/shaca_loader.ts b/src/share/shaca/shaca_loader.ts
index 1789f6fc0..aab4bca24 100644
--- a/src/share/shaca/shaca_loader.ts
+++ b/src/share/shaca/shaca_loader.ts
@@ -9,7 +9,7 @@ import SAttribute from "./entities/sattribute.js";
 import SAttachment from "./entities/sattachment.js";
 import shareRoot from "../share_root.js";
 import eventService from "../../services/events.js";
-import { SAttachmentRow, SAttributeRow, SBranchRow, SNoteRow } from './entities/rows';
+import { SAttachmentRow, SAttributeRow, SBranchRow, SNoteRow } from './entities/rows.js';
 
 function load() {
     const start = Date.now();