diff --git a/src/becca/entities/abstract_becca_entity.js b/src/becca/entities/abstract_becca_entity.js
index d812443e1..46582b315 100644
--- a/src/becca/entities/abstract_becca_entity.js
+++ b/src/becca/entities/abstract_becca_entity.js
@@ -93,6 +93,8 @@ class AbstractBeccaEntity {
 
         const pojo = this.getPojoToSave();
 
+        console.log(pojo);
+
         sql.transactional(() => {
             sql.upsert(entityName, primaryKeyName, pojo);
 
diff --git a/src/becca/entities/battribute.js b/src/becca/entities/battribute.js
index a203d4469..bc5fd4cdf 100644
--- a/src/becca/entities/battribute.js
+++ b/src/becca/entities/battribute.js
@@ -190,7 +190,7 @@ class BAttribute extends AbstractBeccaEntity {
 
         if (this.position === undefined || this.position === null) {
             const maxExistingPosition = this.getNote().getAttributes()
-                .reduce((maxPosition, attr) => Math.max(maxPosition, attr.position), 0);
+                .reduce((maxPosition, attr) => Math.max(maxPosition, attr.position || 0), 0);
 
             this.position = maxExistingPosition + 10;
         }
diff --git a/src/public/app/services/load_results.js b/src/public/app/services/load_results.js
index 0b1bb7625..58352cec9 100644
--- a/src/public/app/services/load_results.js
+++ b/src/public/app/services/load_results.js
@@ -117,6 +117,10 @@ export default class LoadResults {
         return this.optionNames.includes(name);
     }
 
+    getOptionNames() {
+        return this.optionNames;
+    }
+
     addAttachmentRow(attachment) {
         this.attachmentRows.push(attachment);
     }
diff --git a/src/public/app/widgets/type_widgets/options/options_widget.js b/src/public/app/widgets/type_widgets/options/options_widget.js
index 442237880..3f1630870 100644
--- a/src/public/app/widgets/type_widgets/options/options_widget.js
+++ b/src/public/app/widgets/type_widgets/options/options_widget.js
@@ -50,7 +50,7 @@ export default class OptionsWidget extends NoteContextAwareWidget {
     }
 
     async entitiesReloadedEvent({loadResults}) {
-        if (loadResults.options.length > 0) {
+        if (loadResults.getOptionNames().length > 0) {
             this.refresh();
         }
     }
diff --git a/src/services/ws.js b/src/services/ws.js
index 2d743922d..0ab6a4ffe 100644
--- a/src/services/ws.js
+++ b/src/services/ws.js
@@ -150,7 +150,10 @@ function fillInAdditionalProperties(entityChange) {
     } else if (entityChange.entityName === 'blobs') {
         entityChange.noteIds = sql.getColumn("SELECT noteId FROM notes WHERE blobId = ? AND isDeleted = 0", [entityChange.entityId]);
     } else if (entityChange.entityName === 'attachments') {
-        entityChange.entity = becca.getAttachment(entityChange.entityId, {includeContentLength: true});
+        entityChange.entity = sql.getRow(`SELECT attachments.*, LENGTH(blobs.content) AS contentLength
+                                                FROM attachments
+                                                JOIN blobs USING (blobId)
+                                                WHERE attachmentId = ?`, [entityChange.entityId]);
     }
 
     if (entityChange.entity instanceof AbstractBeccaEntity) {
diff --git a/test-etapi/create-entities.http b/test-etapi/create-entities.http
index 09262aa00..e3d9537fe 100644
--- a/test-etapi/create-entities.http
+++ b/test-etapi/create-entities.http
@@ -85,7 +85,7 @@ Authorization: {{authToken}}
 > {%
     client.assert(response.status === 200);
     client.assert(response.body.branchId == client.global.get("clonedBranchId"));
-    client.assert(response.body.parentNoteId == '_hidden');
+    client.assert(response.body.parentNoteId == "_hidden");
 %}
 
 ###
diff --git a/test-etapi/delete-cloned-branch.http b/test-etapi/delete-cloned-branch.http
index ad72495f4..a87a6fa4d 100644
--- a/test-etapi/delete-cloned-branch.http
+++ b/test-etapi/delete-cloned-branch.http
@@ -22,7 +22,7 @@ Content-Type: application/json
 
 {
   "noteId": "{{createdNoteId}}",
-  "parentNoteId": '_hidden'
+  "parentNoteId": "_hidden"
 }
 
 > {% client.global.set("clonedBranchId", response.body.branchId); %}
diff --git a/test-etapi/delete-note-with-all-branches.http b/test-etapi/delete-note-with-all-branches.http
index 21f96124f..5a50bc4a9 100644
--- a/test-etapi/delete-note-with-all-branches.http
+++ b/test-etapi/delete-note-with-all-branches.http
@@ -38,7 +38,7 @@ Content-Type: application/json
 
 {
   "noteId": "{{createdNoteId}}",
-  "parentNoteId": '_hidden'
+  "parentNoteId": "_hidden"
 }
 
 > {% client.global.set("clonedBranchId", response.body.branchId); %}
diff --git a/test-etapi/get-note-content.http b/test-etapi/get-note-content.http
index 2f22dabbe..50c677dd8 100644
--- a/test-etapi/get-note-content.http
+++ b/test-etapi/get-note-content.http
@@ -21,5 +21,5 @@ Authorization: {{authToken}}
 
 > {%
     client.assert(response.status === 200);
-    client.assert(response.body === "<p>Hi there!</p>");
+    client.assert(response.body === "Hi there!");
 %}
diff --git a/test-etapi/post-note-revision.http b/test-etapi/post-revision.http
similarity index 100%
rename from test-etapi/post-note-revision.http
rename to test-etapi/post-revision.http