diff --git a/frontend/client/src/search-manager.js b/frontend/client/src/search-manager.js
index e61f40fef2..afb3421c70 100644
--- a/frontend/client/src/search-manager.js
+++ b/frontend/client/src/search-manager.js
@@ -27,7 +27,7 @@
 		this.type = type || 'list';
 		this.dateTime = dateTime;
 		
-		this.data = this.default = defaultData || {
+		this.data = this.defaultData = defaultData || {
 			textFilter: '',			
 			bool: {},
 			basic: {name: true},
@@ -99,7 +99,7 @@
 		},		
 		
 		loadStored: function () {
-			this.data = this.storage.get(this.type + 'Search', this.scope) || _.clone(this.default);			
+			this.data = this.storage.get(this.type + 'Search', this.scope) || _.clone(this.defaultData);			
 			return this;
 		},
 		
@@ -119,7 +119,7 @@
 		},
 		
 		reset: function () {
-			this.data = _.clone(this.default);
+			this.data = _.clone(this.defaultData);
 			if (this.storage) {
 				this.storage.clear(this.type + 'Search', this.scope);
 			}
diff --git a/frontend/client/src/ui.js b/frontend/client/src/ui.js
index 2bde57e520..adbb0bd0c8 100644
--- a/frontend/client/src/ui.js
+++ b/frontend/client/src/ui.js
@@ -23,7 +23,7 @@
 	var Dialog = function (options) {
 		options = options || {};
 		
-		this.class = 'dialog';
+		this.className = 'dialog';
 		this.backdrop = 'static';
 		this.closeButton = true;
 		this.header = false;
@@ -36,7 +36,7 @@
 		this.container = 'body'
 		this.onRemove = function () {};
 		
-		var params = ['class', 'backdrop', 'closeButton', 'header', 'body', 'width', 'height', 'buttons', 'removeOnClose', 'graggable', 'container', 'onRemove'];
+		var params = ['className', 'backdrop', 'closeButton', 'header', 'body', 'width', 'height', 'buttons', 'removeOnClose', 'graggable', 'container', 'onRemove'];
 		params.forEach(function (param) {
 			if (param in options) {
 				this[param] = options[param];
@@ -66,7 +66,7 @@
 		this.contents = '<div class="modal-dialog"><div class="modal-content">' + this.contents + '</div></div>'
 		
 		$('<div />').attr('id', this.id)
-		  .attr('class', this.class + ' modal')
+		  .attr('class', this.className + ' modal')
 		  .attr('role', 'dialog')
 		  .attr('tabindex', '-1')
 		  .html(this.contents)
diff --git a/frontend/client/src/views/fields/attachment-multiple.js b/frontend/client/src/views/fields/attachment-multiple.js
index 0e5cd4628a..aa8c13db0d 100644
--- a/frontend/client/src/views/fields/attachment-multiple.js
+++ b/frontend/client/src/views/fields/attachment-multiple.js
@@ -238,6 +238,7 @@ Espo.define('Views.Fields.AttachmentMultiple', 'Views.Fields.Base', function (De
 							url: 'Attachment/action/upload',
 							data: e.target.result,
 							contentType: 'multipart/encrypted',
+							timeout: 0,
 						}).done(function (data) {
 								
 							attachment.id = data.attachmentId;							
diff --git a/frontend/client/src/views/fields/file.js b/frontend/client/src/views/fields/file.js
index 247856d4aa..76dd3d14f0 100644
--- a/frontend/client/src/views/fields/file.js
+++ b/frontend/client/src/views/fields/file.js
@@ -226,6 +226,7 @@ Espo.define('Views.Fields.File', 'Views.Fields.Link', function (Dep) {
 						url: 'Attachment/action/upload',
 						data: e.target.result,
 						contentType: 'multipart/encrypted',
+						timeout: 0,
 					}).done(function (data) {
 						attachment.id = data.attachmentId;							
 						attachment.set('name', file.name);
diff --git a/package.json b/package.json
index 18a8c53797..f9cd8af9dc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "espocrm",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "",
   "main": "index.php",
   "repository": "",