diff --git a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
index c77ced40f..2b7fbf8e4 100644
--- a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
@@ -288,8 +288,8 @@ public class YoutubeExtractor implements Extractor {
         videoInfo.upload_date = doc.select("strong[class=\"watch-time-text\"").first()
                 .text();
 
-        // Try to only use date not the text around it
-        videoInfo.upload_date = matchGroup1("([0-9.]*$)", videoInfo.upload_date);
+        // Extracting the date itself from header
+        videoInfo.upload_date = matchGroup1("([A-Za-z]{3}\\s[\\d]{1,2},\\s[\\d]{4}$)", videoInfo.upload_date);
 
         // description
         videoInfo.description = doc.select("p[id=\"eow-description\"]").first()
@@ -320,6 +320,9 @@ public class YoutubeExtractor implements Extractor {
         // view count
         videoInfo.view_count = doc.select("div[class=\"watch-view-count\"]").first().text();
 
+        // Extracting the number of views from header
+        videoInfo.view_count = matchGroup1("([0-9,]*$)", videoInfo.view_count);
+
         // next video
         videoInfo.nextVideo = extractVideoInfoItem(doc.select("div[class=\"watch-sidebar-section\"]").first()
                 .select("li").first());
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d61ab8489..a86ea5544 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,5 +49,5 @@
     <string name="showNextAndSimilarTitle">Show next and similar videos</string>
     <string name="urlNotSupportedText">URL not supported.</string>
     <string name="showSimilarVideosButtonText">Similar videos</string>
-    <string name="contentCountryTitle">Preferable content language</string>
+    <string name="searchLanguageTitle">Preferable content language</string>
 </resources>
\ No newline at end of file