diff --git a/Clipper/joplin-webclipper/content_scripts/index.js b/Clipper/joplin-webclipper/content_scripts/index.js
index ef38cd0567..b8a80e6e12 100644
--- a/Clipper/joplin-webclipper/content_scripts/index.js
+++ b/Clipper/joplin-webclipper/content_scripts/index.js
@@ -103,7 +103,7 @@
 	// Cleans up element by removing all its invisible children (which we don't want to render as Markdown)
 	// And hard-code the image dimensions so that the information can be used by the clipper server to
 	// display them at the right sizes in the notes.
-	function cleanUpElement(element, imageSizes, imageIndexes) {
+	function cleanUpElement(convertToMarkup, element, imageSizes, imageIndexes) {
 		const childNodes = element.childNodes;
 		const hiddenNodes = [];
 
@@ -132,19 +132,19 @@
 					if (!(src in imageIndexes)) imageIndexes[src] = 0;
 					const imageSize = imageSizes[src][imageIndexes[src]];
 					imageIndexes[src]++;
-					if (imageSize) {
+					if (imageSize && convertToMarkup === 'markdown') {
 						node.width = imageSize.width;
 						node.height = imageSize.height;
 					}
 				}
 
-				cleanUpElement(node, imageSizes, imageIndexes);
+				cleanUpElement(convertToMarkup, node, imageSizes, imageIndexes);
 			}
 		}
 
 		for (const hiddenNode of hiddenNodes) {
 			if (!hiddenNode.parentNode) continue;
-			hiddenNode.parentNode.remove(hiddenNode);
+			hiddenNode.parentNode.removeChild(hiddenNode);
 		}
 	}
 
@@ -260,6 +260,8 @@
 	async function prepareCommandResponse(command) {
 		console.info('Got command: ' + command.name);
 
+		const convertToMarkup = command.preProcessFor ? command.preProcessFor : 'markdown';
+
 		const clippedContentResponse = (title, html, imageSizes, anchorNames, stylesheets) => {
 			return {
 				name: 'clippedContent',
@@ -272,7 +274,7 @@
 				image_sizes: imageSizes,
 				anchor_names: anchorNames,
 				source_command: Object.assign({}, command),
-				convert_to: command.preProcessFor ? command.preProcessFor : 'markdown',
+				convert_to: convertToMarkup,
 				stylesheets: stylesheets,
 			};			
 		}
@@ -306,9 +308,9 @@
 			const cleanDocument = document.body.cloneNode(true);
 			const imageSizes = getImageSizes(document, true);
 			const imageIndexes = {};
-			cleanUpElement(cleanDocument, imageSizes, imageIndexes);
+			cleanUpElement(convertToMarkup, cleanDocument, imageSizes, imageIndexes);
 
-			const stylesheets = command.preProcessFor === 'html' ? getStyleSheets(document) : null;
+			const stylesheets = convertToMarkup === 'html' ? getStyleSheets(document) : null;
 			return clippedContentResponse(pageTitle(), cleanDocument.innerHTML, imageSizes, getAnchorNames(document), stylesheets);
 
 		} else if (command.name === "selectedHtml") {
@@ -320,7 +322,7 @@
 			container.appendChild(range.cloneContents());
 			const imageSizes = getImageSizes(document, true);
 			const imageIndexes = {};
-			cleanUpElement(container, imageSizes, imageIndexes);
+			cleanUpElement(convertToMarkup, container, imageSizes, imageIndexes);
 			return clippedContentResponse(pageTitle(), container.innerHTML, getImageSizes(document), getAnchorNames(document));
 
 		} else if (command.name === 'screenshot') {
diff --git a/ElectronClient/app/gui/NoteText.jsx b/ElectronClient/app/gui/NoteText.jsx
index 61263a0270..a78ddcbfac 100644
--- a/ElectronClient/app/gui/NoteText.jsx
+++ b/ElectronClient/app/gui/NoteText.jsx
@@ -1643,6 +1643,7 @@ class NoteTextComponent extends React.Component {
 		const style = this.props.style;
 		const note = this.state.note;
 		const body = note && note.body ? note.body : '';
+		const markupLanguage = note ? note.markup_language : Note.MARKUP_LANGUAGE_MARKDOWN;
 		const theme = themeStyle(this.props.theme);
 		const visiblePanes = this.props.visiblePanes || ['editor', 'viewer'];
 		const isTodo = note && !!note.is_todo;
@@ -1813,7 +1814,7 @@ class NoteTextComponent extends React.Component {
 
 		const toolbarItems = this.createToolbarItems(note);
 
-		const toolbar = <Toolbar
+		const toolbar = markupLanguage !== Note.MARKUP_LANGUAGE_MARKDOWN ? null : <Toolbar
 			style={toolbarStyle}
 			items={toolbarItems}
 		/>
diff --git a/ReactNativeClient/lib/renderers/utils.js b/ReactNativeClient/lib/renderers/utils.js
index 0febfc1a6a..6605653d68 100644
--- a/ReactNativeClient/lib/renderers/utils.js
+++ b/ReactNativeClient/lib/renderers/utils.js
@@ -92,6 +92,8 @@ utils.resourceStatus = function(resourceInfo) {
 }
 
 utils.imageReplacement = function(src, resources, resourceBaseUrl) {
+	if (!Resource.isResourceUrl(src)) return null;
+	
 	const resourceId = Resource.urlToId(src);
 	const result = resources[resourceId];
 	const resource = result ? result.item : null;
diff --git a/ReactNativeClient/lib/services/rest/Api.js b/ReactNativeClient/lib/services/rest/Api.js
index b167b0dd43..593fa2de1b 100644
--- a/ReactNativeClient/lib/services/rest/Api.js
+++ b/ReactNativeClient/lib/services/rest/Api.js
@@ -585,7 +585,7 @@ class Api {
 			});
 		}
 
-		const concurrency = 3
+		const concurrency = 10;
 		const pool = new PromisePool(promiseProducer, concurrency)
 		await pool.start()