diff --git a/src/components/Audioplayer/RepeatDropdown/index.js b/src/components/Audioplayer/RepeatDropdown/index.js
index 6b58449c1..e95e86e64 100644
--- a/src/components/Audioplayer/RepeatDropdown/index.js
+++ b/src/components/Audioplayer/RepeatDropdown/index.js
@@ -61,7 +61,8 @@ class RepeatButton extends Component {
               value={repeat.from}
               onChange={(event) => {
                 let to = parseInt(event.target.value, 10) + 3;
-                to = to < chapter.ayat ? to : chapter.ayat;
+                to = to < chapter.versesCount ? to : chapter.versesCount;
+
                 setRepeat({
                   ...repeat,
                   from: parseInt(event.target.value, 10),
@@ -71,7 +72,7 @@ class RepeatButton extends Component {
             >
               {
                 array.reduce((options, ayah, index) => {
-                  if (index + 1 < chapter.ayat) { // Exclude last verse
+                  if (index + 1 < chapter.versesCount) { // Exclude last verse
                     options.push(
                       <option key={index} value={index + 1}>
                         {index + 1}
@@ -97,7 +98,7 @@ class RepeatButton extends Component {
             >
               {
                 array.reduce((options, ayah, index) => {
-                  if ((repeat.from ? repeat.from : 1) < index + 1 && index + 1 <= chapter.ayat) {
+                  if ((repeat.from ? repeat.from : 1) < index + 1 && index + 1 <= chapter.versesCount) { // eslint-disable-line max-len
                     options.push(
                       <option key={index} value={index + 1}>
                         {index + 1}
diff --git a/src/containers/Surah/index.js b/src/containers/Surah/index.js
index 8cf81268b..5704309f3 100644
--- a/src/containers/Surah/index.js
+++ b/src/containers/Surah/index.js
@@ -411,17 +411,17 @@ function mapStateToProps(state, ownProps) {
   const verseIds = new Set(verseArray);
   const lastAyahInArray = verseArray.slice(-1)[0];
   const isSingleAyah = !!ownProps.params.range && !ownProps.params.range.includes('-');
-
+  const currentVerse = state.audioplayer.currentVerse || Object.keys(verses)[0];
 
   return {
     chapter,
     verses,
     verseIds,
     isSingleAyah,
+    currentVerse,
     info: state.chapters.infos[ownProps.params.chapterId],
     isStarted: state.audioplayer.isStarted,
     isPlaying: state.audioplayer.isPlaying,
-    currentVerse: state.audioplayer.currentVerse,
     isAuthenticated: state.auth.loaded,
     currentWord: state.verses.currentWord,
     isEndOfSurah: lastAyahInArray === chapter.versesCount,
diff --git a/src/helpers/Html.js b/src/helpers/Html.js
index be1b935c1..b6c85c59e 100644
--- a/src/helpers/Html.js
+++ b/src/helpers/Html.js
@@ -34,6 +34,20 @@ const Html = ({ store, component, assets }) => {
       </head>
       <body>
         <div id="app" dangerouslySetInnerHTML={{ __html: content }} />
+        <style
+          dangerouslySetInnerHTML={{
+            __html: '.async-hide { opacity: 0 !important}'
+          }}
+        />
+        <script
+          dangerouslySetInnerHTML={{
+            __html: `(function(a,s,y,n,c,h,i,d,e){s.className+=' '+y;h.start=1*new Date;
+            h.end=i=function(){s.className=s.className.replace(RegExp(' ?'+y),'')};
+            (a[n]=a[n]||[]).hide=h;setTimeout(function(){i();h.end=null},c);h.timeout=c;
+            })(window,document.documentElement,'async-hide','dataLayer',4000,
+            {'GTM-PNMFTW3':true});`
+          }}
+        />
         <script
           dangerouslySetInnerHTML={{
             __html: `(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
diff --git a/src/redux/modules/lines.js b/src/redux/modules/lines.js
index fa9974627..ef648e4d0 100644
--- a/src/redux/modules/lines.js
+++ b/src/redux/modules/lines.js
@@ -33,19 +33,19 @@ export default function reducer(state = initialState, action = {}) {
         const ayah = ayahs[ayahId];
 
         ayah.words.forEach((word) => {
-          if (lines[`${word.pageNum}-${word.lineNum}`]) {
-            const isInArray = lines[`${word.pageNum}-${word.lineNum}`].find((item) => {
-              const itemChecksum = `${item.lineNum}${item.code}${item.verseKey}${item.position}`;
-              const dataChecksum = `${word.lineNum}${word.code}${word.verseKey}${item.position}`;
+          if (lines[`${word.pageNumber}-${word.lineNumber}`]) {
+            const isInArray = lines[`${word.pageNumber}-${word.lineNumber}`].find((item) => {
+              const itemChecksum = `${item.lineNumber}${item.code}${item.verseKey}${item.position}`;
+              const dataChecksum = `${word.lineNumber}${word.code}${word.verseKey}${item.position}`;
 
               return itemChecksum === dataChecksum;
             });
 
             if (!isInArray) {
-              lines[`${word.pageNum}-${word.lineNum}`].push(word);
+              lines[`${word.pageNumber}-${word.lineNumber}`].push(word);
             }
           } else {
-            lines[`${word.pageNum}-${word.lineNum}`] = [word];
+            lines[`${word.pageNumber}-${word.lineNumber}`] = [word];
           }
         });
       });
