diff --git a/index.html b/index.html
index 3d144a38d..17089f90f 100644
--- a/index.html
+++ b/index.html
@@ -210,6 +210,7 @@ <h3>Want to write better? Buy our eBook!</h3>
                 </aside>
             </div>
         </div>
+
     </div>
     <div class="footer-widgets">
         <div class="wrap">
diff --git a/js/app.js b/js/app.js
index 18ec7cda6..c5662c6b9 100644
--- a/js/app.js
+++ b/js/app.js
@@ -443,9 +443,8 @@ YoastSEO.App.prototype.pluginsLoaded = function() {
  * Runs a queue with tests where no keyword is required.
  */
 YoastSEO.App.prototype.noKeywordQueue = function() {
-	var data = this.rawData;
-	data.queue = [ "keyWordCheck", "wordCount", "fleschReading", "pageTitleLength", "urlStopwords" ];
-	this.runAnalyzer( data );
+	this.rawData.queue = [ "keyWordCheck", "wordCount", "fleschReading", "pageTitleLength", "urlStopwords", "metaDescription" ];
+	this.runAnalyzer( this.rawData );
 };
 
 /**
diff --git a/js/preprocessor.js b/js/preprocessor.js
index d8ffb4bee..203aea597 100644
--- a/js/preprocessor.js
+++ b/js/preprocessor.js
@@ -43,8 +43,13 @@ YoastSEO.PreProcessor.prototype.textFormat = function() {
 YoastSEO.PreProcessor.prototype.countStore = function() {
 
 	/*wordcounters*/
-	this.__store.wordcount = this.__store.cleanText.split( " " ).length;
-	this.__store.wordcountNoTags = this.__store.cleanTextNoTags.split( " " ).length;
+	this.__store.wordcount = this.__store.cleanText === "" ?
+		0 :
+		this.__store.cleanText.split( " " ).length;
+
+	this.__store.wordcountNoTags = this.__store.cleanTextNoTags === "" ?
+		0 :
+		this.__store.cleanTextNoTags.split( " " ).length;
 
 	/*sentencecounters*/
 	this.__store.sentenceCount = this.sentenceCount( this.__store.cleanText );
diff --git a/js/snippetPreview.js b/js/snippetPreview.js
index 0b719a68c..87556cac6 100644
--- a/js/snippetPreview.js
+++ b/js/snippetPreview.js
@@ -15,6 +15,7 @@ YoastSEO = ( "undefined" === typeof YoastSEO ) ? {} : YoastSEO;
  */
 YoastSEO.SnippetPreview = function( refObj ) {
 	this.refObj = refObj;
+	this.unformattedText = {};
 	this.init();
 };
 
@@ -97,7 +98,7 @@ YoastSEO.SnippetPreview.prototype.formatCite = function() {
  * @returns formatted metatext
  */
 YoastSEO.SnippetPreview.prototype.formatMeta = function() {
-	var meta = this.refObj.rawData.snippetMeta;
+	var meta = this.refObj.rawData.meta;
 	if ( meta === "" ) {
 		meta = this.getMetaText();
 	}
@@ -268,7 +269,7 @@ YoastSEO.SnippetPreview.prototype.checkTextLength = function( ev ) {
 	switch ( ev.currentTarget.id ) {
 		case "snippet_meta":
 			if ( text.length > YoastSEO.analyzerConfig.maxMeta ) {
-				ev.currentTarget.__unformattedText = ev.currentTarget.textContent;
+				YoastSEO.app.snippetPreview.unformattedText.snippet_meta = ev.currentTarget.textContent;
 				ev.currentTarget.textContent = text.substring(
 					0,
 					YoastSEO.analyzerConfig.maxMeta
@@ -278,7 +279,7 @@ YoastSEO.SnippetPreview.prototype.checkTextLength = function( ev ) {
 			break;
 		case "snippet_title":
 			if ( text.length > 40 ) {
-				ev.currentTarget.__unformattedText = ev.currentTarget.textContent;
+				YoastSEO.app.snippetPreview.unformattedText.snippet_title = ev.currentTarget.textContent;
 				ev.currentTarget.textContent = text.substring( 0, 40 );
 				ev.currentTarget.className = "title";
 			}
@@ -288,6 +289,26 @@ YoastSEO.SnippetPreview.prototype.checkTextLength = function( ev ) {
 	}
 };
 
+/**
+ * when clicked on an element in the snippet, checks fills the textContent with the data from the unformatted text.
+ * This removes the keyword highlighting and modified data so the original content can be editted.
+ * @param ev {event}
+ */
+YoastSEO.SnippetPreview.prototype.getUnformattedText = function( ev ) {
+	var currentElement = ev.currentTarget.firstChild.id;
+	ev.currentTarget.firstChild.textContent = YoastSEO.app.snippetPreview.unformattedText[ currentElement ];
+};
+
+/**
+ * when text is entered into the snippetPreview elements, the text is set in the unformattedText object.
+ * This allows the visible data to be editted in the snippetPreview.
+ * @param ev
+ */
+YoastSEO.SnippetPreview.prototype.setUnformattedText = function( ev ) {
+	var currentElement = ev.currentTarget.firstChild.id;
+	YoastSEO.app.snippetPreview.unformattedText[ currentElement ] =  ev.currentTarget.firstChild.textContent;
+};
+
 /**
  * adds and remove the tooLong class when a text is too long.
  * @param ev
@@ -347,30 +368,5 @@ YoastSEO.SnippetPreview.prototype.setFocus = function( ev ) {
 			targetElem = targetElem.nextSibling;
 		}
 	}
-	targetElem.refObj.snippetPreview.setFocusToEnd( targetElem );
 };
 
-/**
- * this function is needed for placing the caret at the end of the input when the text is changed
- * at focus.
- * Otherwise the cursor could end at the beginning of the text.
- * @param elem
- */
-YoastSEO.SnippetPreview.prototype.setFocusToEnd = function( elem ) {
-	if (
-		typeof window.getSelection !== "undefined" &&
-		typeof document.createRange !== "undefined"
-	) {
-		var range = document.createRange();
-		range.selectNodeContents( elem );
-		range.collapse( false );
-		var selection = window.getSelection();
-		selection.removeAllRanges();
-		selection.addRange( range );
-	} else if ( typeof document.body.createTextRange !== "undefined" ) {
-		var textRange = document.body.createTextRange();
-		textRange.moveToElementText( elem );
-		textRange.collapse( false );
-		textRange.select();
-	}
-};