diff --git a/electron.js b/electron.js
index 75d577e48a..921dbc7386 100644
--- a/electron.js
+++ b/electron.js
@@ -19,6 +19,7 @@ let userPath = app.getPath('userData');
 let waitLibraryPromise;
 let useGRPC = !process.env.ANYTYPE_USE_ADDON && (process.env.ANYTYPE_USE_GRPC || (process.platform == "win32") || is.development);
 let defaultChannel = version.match('alpha') ? 'alpha' : 'latest';
+let timeoutUpdate = 0;
 
 let service, server;
 
@@ -400,8 +401,10 @@ function configSet (obj, callBack) {
 
 function checkUpdate () {
 	if (!isUpdating) {
-		Util.log('info', 'checkForUpdatesAndNotify');
+		Util.log('info', 'checkUpdate');
 		autoUpdater.checkForUpdatesAndNotify();
+		clearTimeout(timeoutUpdate);
+		timeoutUpdate = setTimeout(checkUpdate, 600 * 1000);
 	};
 };
 
@@ -413,7 +416,6 @@ function autoUpdaterInit () {
 	autoUpdater.channel = config.channel;
 	
 	checkUpdate();
-	setInterval(checkUpdate, 600 * 1000);
 	
 	autoUpdater.on('checking-for-update', () => {
 		Util.log('info', 'Checking for update');
@@ -422,6 +424,7 @@ function autoUpdaterInit () {
 	autoUpdater.on('update-available', (info) => {
 		Util.log('info', 'Update available');
 		isUpdating = true;
+		clearTimeout(timeoutUpdate);
 		win.webContents.send('update');
 	});
 	
diff --git a/src/ts/component/block/image.tsx b/src/ts/component/block/image.tsx
index 44c473f4b1..be0478b1ed 100644
--- a/src/ts/component/block/image.tsx
+++ b/src/ts/component/block/image.tsx
@@ -27,8 +27,6 @@ class BlockImage extends React.Component<Props, {}> {
 		this.onChangeUrl = this.onChangeUrl.bind(this);
 		this.onChangeFile = this.onChangeFile.bind(this);
 		this.onClick = this.onClick.bind(this);
-		this.onMenuDown = this.onMenuDown.bind(this);
-		this.onMenuClick = this.onMenuClick.bind(this);
 	};
 
 	render () {
@@ -63,7 +61,6 @@ class BlockImage extends React.Component<Props, {}> {
 					<div className="wrap resizable" style={css}>
 						<img className="media" src={this.getUrl()} onDragStart={(e: any) => { e.preventDefault(); }} onClick={this.onClick} />
 						<Icon className="resize" onMouseDown={(e: any) => { this.onResizeStart(e, false); }} />
-						<Icon id={'block-image-menu-' + id} className="dots dn" onMouseDown={this.onMenuDown} onClick={this.onMenuClick} />
 					</div>
 				);
 				break;
@@ -232,49 +229,10 @@ class BlockImage extends React.Component<Props, {}> {
 		});
 	};
 	
-	onMenuDown (e: any) {
-		const { dataset } = this.props;
-		const { selection } = dataset || {};
-		const win = $(window);
-		
-		if (selection) {
-			selection.preventClear(true);
-			
-			win.unbind('mouseup.selectionBlock').on('mouseup.selectionBlock', () => {
-				selection.preventClear(false);
-				win.unbind('mouseup.selectionBlock');
-			});
-		};
-	};
-	
-	onMenuClick (e: any) {
-		const { dataset, rootId, block } = this.props;
-		const { id } = block;
-		const { selection } = dataset || {};
-		
-		commonStore.menuOpen('blockAction', { 
-			element: '#block-image-menu-' + id,
-			type: I.MenuType.Vertical,
-			offsetX: 0,
-			offsetY: 4,
-			vertical: I.MenuDirection.Bottom,
-			horizontal: I.MenuDirection.Right,
-			data: {
-				blockId: id,
-				blockIds: DataUtil.selectionGet(id, this.props),
-				rootId: rootId,
-				dataset: dataset,
-			},
-			onClose: () => {
-				selection.preventClear(false);
-			}
-		});
-	};
-	
 	getUrl () {
 		const { block } = this.props;
 		const { content } = block;
-		const { state, hash } = content;
+		const { hash } = content;
 		
 		return commonStore.imageUrl(hash, Constant.size.image);
 	};
diff --git a/src/ts/component/block/index.tsx b/src/ts/component/block/index.tsx
index ab73486465..ea24b09241 100644
--- a/src/ts/component/block/index.tsx
+++ b/src/ts/component/block/index.tsx
@@ -354,9 +354,7 @@ class Block extends React.Component<Props, {}> {
 				dataset: dataset,
 			},
 			onClose: () => {
-				selection.preventClear(false);
-				selection.clear();
-
+				selection.clear(true);
 				focus.apply();
 			}
 		});
diff --git a/src/ts/component/block/title.tsx b/src/ts/component/block/title.tsx
index a3bdb8a79d..5ddc7c511c 100644
--- a/src/ts/component/block/title.tsx
+++ b/src/ts/component/block/title.tsx
@@ -40,11 +40,7 @@ class BlockTitle extends React.Component<Props, {}> {
 		const details = blockStore.getDetails(rootId, rootId);
 		const { id } = block;
 		
-		let { name } = details;
-		if (name == Constant.default.name) {
-			name = '';
-		};
-		
+		const name = this.checkName();
 		const cv = [ 'value', 'focusable', 'c' + id ];
 		
 		return (
@@ -231,7 +227,6 @@ class BlockTitle extends React.Component<Props, {}> {
 	onKeyUp (e: any) {
 		e.persist();
 		
-		//this.onChange(e);
 		this.placeHolderCheck();
 	};
 	
@@ -303,10 +298,23 @@ class BlockTitle extends React.Component<Props, {}> {
 	save () {
 		const { rootId } = this.props;
 		const value = this.getValue();
+		const name = this.checkName();
 
-		DataUtil.pageSetName(rootId, value);
+		if (value != name) {
+			DataUtil.pageSetName(rootId, value);
+		};
 	};
-	
+
+	checkName () {
+		const { rootId } = this.props;
+		const details = blockStore.getDetails(rootId, rootId);
+		let { name } = details;
+		if (name == Constant.default.name) {
+			name = '';
+		};
+		return name;
+	};
+
 };
 
 export default BlockTitle;
\ No newline at end of file
diff --git a/src/ts/component/block/video.tsx b/src/ts/component/block/video.tsx
index 028af7d61a..ae64449904 100644
--- a/src/ts/component/block/video.tsx
+++ b/src/ts/component/block/video.tsx
@@ -28,8 +28,6 @@ class BlockVideo extends React.Component<Props, {}> {
 		this.onResize = this.onResize.bind(this);
 		this.onResizeEnd = this.onResizeEnd.bind(this);
 		this.onResizeInit = this.onResizeInit.bind(this);
-		this.onMenuDown = this.onMenuDown.bind(this);
-		this.onMenuClick = this.onMenuClick.bind(this);
 		this.onPlay = this.onPlay.bind(this);
 	};
 
@@ -67,7 +65,6 @@ class BlockVideo extends React.Component<Props, {}> {
 						<video className="media" controls={false} preload="auto" src={commonStore.fileUrl(hash)} />
 						<Icon className="play" onClick={this.onPlay} />
 						<Icon className="resize" onMouseDown={(e: any) => { this.onResizeStart(e, false); }} />
-						<Icon id={'block-video-menu-' + id} className="dots dn" onMouseDown={this.onMenuDown} onClick={this.onMenuClick} />
 					</div>
 				);
 				break;
@@ -281,40 +278,6 @@ class BlockVideo extends React.Component<Props, {}> {
 		]);
 	};
 	
-	onMenuDown (e: any) {
-		const { dataset, rootId, block } = this.props;
-		const { id } = block;
-		const { selection } = dataset || {};
-		
-		if (selection) {
-			selection.preventClear(true);
-		};
-	};
-	
-	onMenuClick (e: any) {
-		const { dataset, rootId, block } = this.props;
-		const { id } = block;
-		const { selection } = dataset || {};
-		
-		commonStore.menuOpen('blockAction', { 
-			element: '#block-video-menu-' + id,
-			type: I.MenuType.Vertical,
-			offsetX: 0,
-			offsetY: 4,
-			vertical: I.MenuDirection.Bottom,
-			horizontal: I.MenuDirection.Right,
-			data: {
-				blockId: id,
-				blockIds: DataUtil.selectionGet(id, this.props),
-				rootId: rootId,
-				dataset: dataset,
-			},
-			onClose: () => {
-				selection.preventClear(false);
-			}
-		});
-	};
-	
 	getWidth (checkMax: boolean, v: number): number {
 		const { block } = this.props;
 		const { id, fields } = block;
diff --git a/src/ts/component/editor/page.tsx b/src/ts/component/editor/page.tsx
index 79a00470b3..3fdca6117e 100644
--- a/src/ts/component/editor/page.tsx
+++ b/src/ts/component/editor/page.tsx
@@ -3,7 +3,7 @@ import * as ReactDOM from 'react-dom';
 import { RouteComponentProps } from 'react-router';
 import { Block, Icon, Loader } from 'ts/component';
 import { commonStore, blockStore } from 'ts/store';
-import { I, C, M, Key, Util, DataUtil, SmileUtil, Mark, focus, keyboard, crumbs, Storage, Mapper } from 'ts/lib';
+import { I, C, M, Key, Util, DataUtil, SmileUtil, Mark, focus, keyboard, crumbs, Storage, Mapper, Action } from 'ts/lib';
 import { observer } from 'mobx-react';
 import { throttle } from 'lodash';
 
@@ -559,8 +559,8 @@ class EditorPage extends React.Component<Props, State> {
 						dataset: dataset,
 					},
 					onClose: () => {
-						selection.preventClear(false);
-						selection.clear();
+						selection.clear(true);
+						focus.apply();
 					}
 				});
 			});
@@ -690,9 +690,7 @@ class EditorPage extends React.Component<Props, State> {
 					dataset: dataset,
 				},
 				onClose: () => {
-					selection.preventClear(false);
-					selection.clear();
-					
+					selection.clear(true);
 					focus.apply();
 				}
 			});
@@ -955,7 +953,7 @@ class EditorPage extends React.Component<Props, State> {
 	};
 	
 	onMenuAdd (id: string, text: string, range: I.TextRange) {
-		const { rootId, dataset } = this.props;
+		const { rootId } = this.props;
 		const block = blockStore.getLeaf(rootId, id);
 
 		if (!block) {
@@ -963,16 +961,10 @@ class EditorPage extends React.Component<Props, State> {
 		};
 		
 		const { content } = block;
-		const { marks, hash } = content;
-		const { selection } = dataset || {};
+		const { marks } = content;
 		
 		const length = String(text || '').length;
 		const position = length ? I.BlockPosition.Bottom : I.BlockPosition.Replace; 
-		const cb = (message: any) => {
-			focus.set(message.blockId, { from: length, to: length });
-			focus.apply();
-		};
-
 		const el = $('#block-' + id);
 		const offset = el.offset() || {};
 		const rect = Util.selectionRect();
@@ -1002,6 +994,11 @@ class EditorPage extends React.Component<Props, State> {
 				blockId: id,
 				rootId: rootId,
 				onSelect: (e: any, item: any) => {
+					const block = blockStore.getLeaf(rootId, id);
+					const { filter } = commonStore;
+
+					text = Util.stringCut(text, filter.from - 1, filter.from + filter.text.length);
+
 					let cb = () => {
 						// Text colors
 						if (item.isTextColor) {
@@ -1016,39 +1013,21 @@ class EditorPage extends React.Component<Props, State> {
 						// Actions
 						if (item.isAction) {
 							switch (item.key) {
+								case 'download':
+									Action.download(block);
+									break;
 
 								case 'move':
-									commonStore.popupOpen('navigation', { 
-										preventResize: true,
-										data: { 
-											type: I.NavigationType.Move, 
-											rootId: rootId,
-											expanded: true,
-											blockId: id,
-											blockIds: [ id ],
-										}, 
-									});
+									Action.move(rootId, id, [ id ]);
 									break;
 
 								case 'copy':
-									C.BlockListDuplicate(rootId, [ id ], id, I.BlockPosition.Bottom, (message: any) => {
-										if (message.blockIds && message.blockIds.length) {
-											focus.set(message.blockIds[message.blockIds.length - 1], { from: 0, to: 0 });
-											focus.apply();
-										};
-									});
+									Action.duplicate(rootId, id, [ id ]);
 									break;
 								
-								case 'download':
-									if (hash) {
-										ipcRenderer.send('download', commonStore.fileUrl(hash));
-									};
-									break;
-									
 								case 'remove':
-									this.blockRemove(block);
+									Action.remove(rootId, id, [ id ]);
 									break;
-									
 							};
 						} else
 
@@ -1099,8 +1078,9 @@ class EditorPage extends React.Component<Props, State> {
 					};
 
 					// Clear filter in block text
-					const block = blockStore.getLeaf(rootId, id);
 					if (block) {
+						// Hack to prevent onBlur save
+						$('#block-' + id + ' .value').text(text);
 						DataUtil.blockSetText(rootId, block, text, marks, true, cb);
 					} else {
 						cb();
diff --git a/src/ts/component/menu/block/action.tsx b/src/ts/component/menu/block/action.tsx
index 70fa76aa2d..d4705776fd 100644
--- a/src/ts/component/menu/block/action.tsx
+++ b/src/ts/component/menu/block/action.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import { Icon, Input, MenuItemVertical } from 'ts/component';
-import { I, C, keyboard, Key, Util, DataUtil, focus } from 'ts/lib';
+import { Input, MenuItemVertical } from 'ts/component';
+import { I, C, keyboard, Key, Util, DataUtil, focus, Action } from 'ts/lib';
 import { blockStore, commonStore } from 'ts/store';
 import { observer } from 'mobx-react';
 
@@ -489,32 +489,13 @@ class MenuBlockAction extends React.Component<Props, State> {
 			return;
 		};
 		
-		const { content } = block;
-
 		switch (item.id) {
 			case 'download':
-				if (!content.hash) {
-					break;
-				};
-				
-				if (block.isImage()) {
-					ipcRenderer.send('download', commonStore.imageUrl(content.hash, Constant.size.image));
-				} else {
-					ipcRenderer.send('download', commonStore.fileUrl(content.hash));
-				};
+				Action.download(block);
 				break;
 					
 			case 'move':
-				commonStore.popupOpen('navigation', { 
-					preventResize: true,
-					data: { 
-						type: I.NavigationType.Move, 
-						rootId: rootId,
-						expanded: true,
-						blockId: blockId,
-						blockIds: blockIds,
-					}, 
-				});
+				Action.move(rootId, blockId, blockIds);
 				break;
 				
 			case 'copy':
@@ -523,23 +504,11 @@ class MenuBlockAction extends React.Component<Props, State> {
 					ids = [ blockId ];
 				};
 
-				C.BlockListDuplicate(rootId, ids, ids[ids.length - 1], I.BlockPosition.Bottom, (message: any) => {
-					if (message.blockIds && message.blockIds.length) {
-						this.setFocus(message.blockIds[message.blockIds.length - 1]);
-					};
-				});
+				Action.duplicate(rootId, ids[ids.length - 1], ids);
 				break;
 				
 			case 'remove':
-				let next = blockStore.getNextBlock(rootId, blockId, -1, (it: any) => {
-					return it.type == I.BlockType.Text;
-				});
-				
-				C.BlockUnlink(rootId, blockIds, (message: any) => {
-					if (next) {
-						this.setFocus(next.id);
-					};
-				});
+				Action.remove(rootId, blockId, blockIds);
 				break;
 				
 			default:
diff --git a/src/ts/component/menu/block/more.tsx b/src/ts/component/menu/block/more.tsx
index 667c9915a6..a89d89e3fe 100644
--- a/src/ts/component/menu/block/more.tsx
+++ b/src/ts/component/menu/block/more.tsx
@@ -192,7 +192,7 @@ class MenuBlockMore extends React.Component<Props, {}> {
 				break;
 				
 			case 'print':
-				window.setTimeout(() => {
+				window.setTimeout(() => { 
 					window.print();
 				}, 300);
 				break;
diff --git a/src/ts/component/util/selection.tsx b/src/ts/component/util/selection.tsx
index 76fbb8322a..b16b8694f7 100644
--- a/src/ts/component/util/selection.tsx
+++ b/src/ts/component/util/selection.tsx
@@ -404,6 +404,9 @@ class SelectionProvider extends React.Component<Props, {}> {
 			return;
 		};
 
+		if (force) {
+			this.preventClear(false);
+		};
 		$('.isSelected').removeClass('isSelected');
 	};
 	
@@ -469,17 +472,27 @@ class SelectionProvider extends React.Component<Props, {}> {
 			};
 
 			ids.push(id);
-			
 			if (withChildren) {
-				$(`#block-children-${id} .selectable`).each((i: number, child: any) => {
-					ids.push(String($(child).data('id') || ''));
-				});
+				this.getChildrenIds(id, ids);
 			};
 		});
 
 		ids = ids.filter((it: string) => { return it; });
 		return [ ...new Set(ids) ];
 	};
+
+	getChildrenIds (id: string, ids: string[]) {
+		const { rootId } = this.props;
+		const childrenIds = blockStore.getChildrenIds(rootId, id);
+		if (!childrenIds.length) {
+			return;
+		};
+
+		for (let childId of childrenIds) {
+			ids.push(childId);
+			this.getChildrenIds(childId, ids);
+		};
+	};
 	
 	injectProps (children: any) {
 		return React.Children.map(children, (child: any) => {
diff --git a/src/ts/lib/action.tsx b/src/ts/lib/action.tsx
new file mode 100644
index 0000000000..f0219c410c
--- /dev/null
+++ b/src/ts/lib/action.tsx
@@ -0,0 +1,66 @@
+import { I, C, focus } from 'ts/lib';
+import { commonStore, blockStore } from 'ts/store';
+
+const Constant = require('json/constant.json');
+const { ipcRenderer } = window.require('electron');
+
+class Action {
+	
+	move (rootId: string, blockId: string, blockIds: string[]) {
+		commonStore.popupOpen('navigation', { 
+			preventResize: true,
+			data: { 
+				type: I.NavigationType.Move, 
+				rootId: rootId,
+				expanded: true,
+				blockId: blockId,
+				blockIds: blockIds,
+			}, 
+		});
+	};
+
+	download (block: I.Block) {
+		const { content } = block;
+		const { hash } = content;
+
+		if (!hash) {
+			return;
+		};
+		
+		const url = block.isImage() ? commonStore.imageUrl(hash, Constant.size.image) : commonStore.fileUrl(hash);
+		ipcRenderer.send('download', url);
+	};
+
+	duplicate (rootId: string, blockId: string, blockIds: string[]) {
+		C.BlockListDuplicate(rootId, blockIds, blockId, I.BlockPosition.Bottom, (message: any) => {
+			const lastId = message.blockIds && message.blockIds.length ? message.blockIds[message.blockIds.length - 1] : '';
+			this.focusToEnd(rootId, lastId);
+		});
+	};
+
+	remove (rootId: string, blockId: string, blockIds: string[]) {
+		let next = blockStore.getNextBlock(rootId, blockId, -1, (it: any) => {
+			return it.type == I.BlockType.Text;
+		});
+		
+		C.BlockUnlink(rootId, blockIds, (message: any) => {
+			if (next) {
+				this.focusToEnd(rootId, next.id);
+			};
+		});
+	};
+
+	focusToEnd (rootId: string, id: string) {
+		const block = blockStore.getLeaf(rootId, id);
+		if (!block) {
+			return;
+		};
+
+		const length = block.getLength();
+		focus.set(id, { from: length, to: length });
+		focus.apply();
+	};
+		
+};
+
+export default new Action();
\ No newline at end of file
diff --git a/src/ts/lib/index.tsx b/src/ts/lib/index.tsx
index 08c14ced6b..17ef08cc1e 100644
--- a/src/ts/lib/index.tsx
+++ b/src/ts/lib/index.tsx
@@ -17,6 +17,7 @@ import * as C from './command';
 import * as Response from './response';
 import * as Docs from 'ts/docs';
 import Mapper from './mapper';
+import Action from './action';
 
 const Constant = require('json/constant.json');
 const Text = require('json/text.json');
@@ -55,4 +56,5 @@ export {
 	Encode,
 	Decode,
 	Mapper,
+	Action,
 };
\ No newline at end of file