diff --git a/client/templates/default/authentication.tpl.php b/client/templates/default/authentication.tpl.php
index 7dfa251..692097c 100755
--- a/client/templates/default/authentication.tpl.php
+++ b/client/templates/default/authentication.tpl.php
@@ -20,7 +20,7 @@
                     <input type="hidden" name="lang" value="<?=$_SESSION['lang']?>">
                 </div>
                 <div class="input-field col s2">
-                    <button class="btn waves-effect waves-light btnPrimary" type="submit" onclick="__gaTracker('send','event','My VHL','VHL Search Bar',document.getElementById('q').value);">
+                    <button class="btn waves-effect waves-light btnPrimary" type="submit" onclick="gtag('send','event','My VHL','VHL Search Bar',document.getElementById('q').value);">
                         <i class="material-icons">search</i>
                     </button>
                 </div>
diff --git a/client/templates/default/menu.tpl.php b/client/templates/default/menu.tpl.php
index ef0dfb1..f44ba6d 100755
--- a/client/templates/default/menu.tpl.php
+++ b/client/templates/default/menu.tpl.php
@@ -25,7 +25,7 @@
                         <img class="activator" src="<?php echo RELATIVE_PATH; ?>/images/<?php echo $_SESSION["skin"]; ?>/favoritos-<?php echo $_SESSION["lang"]; ?>.jpg" alt="Título Documentos Favoritos">
                     </div>
                     <div class="card-action">
-                        <a href="<?php echo RELATIVE_PATH; ?>/controller/mydocuments/control/business" onclick="__gaTracker('send','event','Overview','Favorite Documents','See All');"><b><?php echo $trans->getTrans($_REQUEST["action"],'MORE'); ?> [+]</b></a>
+                        <a href="<?php echo RELATIVE_PATH; ?>/controller/mydocuments/control/business" onclick="gtag('send','event','Overview','Favorite Documents','See All');"><b><?php echo $trans->getTrans($_REQUEST["action"],'MORE'); ?> [+]</b></a>
                     </div>
                     <div class="card-reveal">
                         <span class="card-title grey-text text-darken-4"><?php echo $trans->getTrans('menu','SHELF_WIDGET'); ?><i class="material-icons right">close</i></span>
@@ -42,7 +42,7 @@
                                         $docURL = $col['docURL'];
                                     }
                                 ?>
-                                <p><a href="<?php echo $docURL; ?>" class="record" target="_blank" onclick="__gaTracker('send','event','Overview','Favorite Documents','<?php echo htmlspecialchars($col['title']); ?>');"><?php echo $col['title'] ?></a></p>
+                                <p><a href="<?php echo $docURL; ?>" class="record" target="_blank" onclick="gtag('send','event','Overview','Favorite Documents','<?php echo htmlspecialchars($col['title']); ?>');"><?php echo $col['title'] ?></a></p>
                             <?php endforeach; ?>
                         <?php endif; ?>
                     </div>
@@ -54,13 +54,13 @@
                         <img class="activator" src="<?php echo RELATIVE_PATH; ?>/images/<?php echo $_SESSION["skin"]; ?>/interesse-<?php echo $_SESSION["lang"]; ?>.jpg" alt="Título Temas de Interesses">
                     </div>
                     <div class="card-action">
-                        <a href="<?php echo RELATIVE_PATH; ?>/controller/myprofiledocuments/control/business" onclick="__gaTracker('send','event','Overview','Interest Topics','See All');"><b><?php echo $trans->getTrans($_REQUEST["action"],'MORE'); ?> [+]</b></a>
+                        <a href="<?php echo RELATIVE_PATH; ?>/controller/myprofiledocuments/control/business" onclick="gtag('send','event','Overview','Interest Topics','See All');"><b><?php echo $trans->getTrans($_REQUEST["action"],'MORE'); ?> [+]</b></a>
                     </div>
                     <div class="card-reveal">
                         <span class="card-title grey-text text-darken-4"><?php echo $trans->getTrans('menu','PROFILE_WIDGET'); ?><i class="material-icons right">close</i></span>
                         <?php if ( $profiles ) : ?>
                             <?php foreach ( $profiles as $profile ) : ?>
-                                <p><a href="<?php echo RELATIVE_PATH.'/controller/myprofiledocuments/control/business/profile/'.$profile["profileID"]; ?>" onclick="__gaTracker('send','event','Overview','Interest Topics','<?php echo htmlspecialchars($profile['profileName']); ?>');"><i class="fas fa-folder-open"></i> <?php echo $profile['profileName']; ?></a></p>
+                                <p><a href="<?php echo RELATIVE_PATH.'/controller/myprofiledocuments/control/business/profile/'.$profile["profileID"]; ?>" onclick="gtag('send','event','Overview','Interest Topics','<?php echo htmlspecialchars($profile['profileName']); ?>');"><i class="fas fa-folder-open"></i> <?php echo $profile['profileName']; ?></a></p>
                             <?php endforeach; ?>
                         <?php endif; ?>
                     </div>
@@ -72,7 +72,7 @@
                         <img class="activator" src="<?php echo RELATIVE_PATH; ?>/images/<?php echo $_SESSION["skin"]; ?>/historico-<?php echo $_SESSION["lang"]; ?>.jpg"  alt="Título Histórico de Buscas">
                     </div>
                     <div class="card-action">
-                        <a href="<?php echo RELATIVE_PATH; ?>/controller/mysearches/control/business" onclick="__gaTracker('send','event','Overview','VHL Search History','See All');"><b><?php echo $trans->getTrans($_REQUEST["action"],'MORE'); ?> [+]</b></a>
+                        <a href="<?php echo RELATIVE_PATH; ?>/controller/mysearches/control/business" onclick="gtag('send','event','Overview','VHL Search History','See All');"><b><?php echo $trans->getTrans($_REQUEST["action"],'MORE'); ?> [+]</b></a>
                     </div>
                     <div class="card-reveal">
                         <span class="card-title grey-text text-darken-4"><?php echo $trans->getTrans($_REQUEST["action"],'SEARCH_WIDGET'); ?><i class="material-icons right">close</i></span>
@@ -80,9 +80,9 @@
                             <?php foreach ( $searches as $search ) : $count++; ?>
                                 <p>
                                     <?php if ( 'portal' == $_SESSION['iahx'] ) : ?>
-                                        <a id="v<?php echo $count; ?>" class="portal" data-origin="portal" data-query="<?php echo $search['query']; ?>" data-filter="<?php echo $search['filter']; ?>" onclick="__gaTracker('send','event','Overview','VHL Search History','<?php echo htmlspecialchars($search['query']); ?>');"><i class="fas fa-search"></i> <?php echo CharTools::shortenedQueryString($search['query'], true); ?></a>
+                                        <a id="v<?php echo $count; ?>" class="portal" data-origin="portal" data-query="<?php echo $search['query']; ?>" data-filter="<?php echo $search['filter']; ?>" onclick="gtag('send','event','Overview','VHL Search History','<?php echo htmlspecialchars($search['query']); ?>');"><i class="fas fa-search"></i> <?php echo CharTools::shortenedQueryString($search['query'], true); ?></a>
                                     <?php else : ?>
-                                        <a id="v<?php echo $count; ?>" class="search" data-origin="<?php echo $_SESSION['iahx']; ?>" data-label="<?php echo $label; ?>" data-query="<?php echo $search['query']; ?>" data-filter="<?php echo $search['filter']; ?>" onclick="__gaTracker('send','event','Overview','VHL Search History','<?php echo htmlspecialchars($search['query']); ?>');"><i class="fas fa-search"></i> <?php echo CharTools::shortenedQueryString($search['query'], true); ?></a>
+                                        <a id="v<?php echo $count; ?>" class="search" data-origin="<?php echo $_SESSION['iahx']; ?>" data-label="<?php echo $label; ?>" data-query="<?php echo $search['query']; ?>" data-filter="<?php echo $search['filter']; ?>" onclick="gtag('send','event','Overview','VHL Search History','<?php echo htmlspecialchars($search['query']); ?>');"><i class="fas fa-search"></i> <?php echo CharTools::shortenedQueryString($search['query'], true); ?></a>
                                    <?php endif; ?>
                                 </p>
                             <?php endforeach; ?>
diff --git a/client/templates/default/mydocuments.tpl.php b/client/templates/default/mydocuments.tpl.php
index d0f3784..bf95062 100755
--- a/client/templates/default/mydocuments.tpl.php
+++ b/client/templates/default/mydocuments.tpl.php
@@ -40,9 +40,9 @@
                                     <a class='dropdown-trigger btn2 btnSuccess' href='#' data-target='dir-actions'><i class="fas fa-angle-down"></i></a>
                                     <!-- Dropdown Structure -->
                                     <ul id='dir-actions' class='dropdown-content'>
-                                        <li><a href="#modal-ajax" class="modal-trigger modal-ajax" data-source="<?php echo RELATIVE_PATH; ?>/controller/directories/control/business/task/edit/directory/<?php echo $_REQUEST["directory"]; ?>" onclick="__gaTracker('send','event','Favorite Documents','Edit Collection','<?php echo htmlspecialchars($resultDirName); ?>');"><i class="far fa-edit right m1"></i><?php echo $trans->getTrans($_REQUEST["action"],'EDIT_FOLDER'); ?></a></li>
-                                        <li><a href="#modal-ajax" class="modal-trigger modal-ajax" data-source="<?php echo RELATIVE_PATH; ?>/controller/directories/control/business/task/delete/directory/<?php echo $_REQUEST["directory"]; ?>" onclick="__gaTracker('send','event','Favorite Documents','Remove Collection','<?php echo htmlspecialchars($resultDirName); ?>');"><i class="fas fa-eraser right m1"></i><?php echo $trans->getTrans($_REQUEST["action"],'REMOVE_FOLDER'); ?></a></li>
-                                        <li><a href="#modal-share" class="modal-trigger" onclick="__gaTracker('send','event','Favorite Documents','Share Collection','<?php echo htmlspecialchars($resultDirName); ?>');"><i class="fas fa-share-alt right m1"></i><?php echo $trans->getTrans($_REQUEST["action"],'SHARE_COLLECTION'); ?></a></li>
+                                        <li><a href="#modal-ajax" class="modal-trigger modal-ajax" data-source="<?php echo RELATIVE_PATH; ?>/controller/directories/control/business/task/edit/directory/<?php echo $_REQUEST["directory"]; ?>" onclick="gtag('send','event','Favorite Documents','Edit Collection','<?php echo htmlspecialchars($resultDirName); ?>');"><i class="far fa-edit right m1"></i><?php echo $trans->getTrans($_REQUEST["action"],'EDIT_FOLDER'); ?></a></li>
+                                        <li><a href="#modal-ajax" class="modal-trigger modal-ajax" data-source="<?php echo RELATIVE_PATH; ?>/controller/directories/control/business/task/delete/directory/<?php echo $_REQUEST["directory"]; ?>" onclick="gtag('send','event','Favorite Documents','Remove Collection','<?php echo htmlspecialchars($resultDirName); ?>');"><i class="fas fa-eraser right m1"></i><?php echo $trans->getTrans($_REQUEST["action"],'REMOVE_FOLDER'); ?></a></li>
+                                        <li><a href="#modal-share" class="modal-trigger" onclick="gtag('send','event','Favorite Documents','Share Collection','<?php echo htmlspecialchars($resultDirName); ?>');"><i class="fas fa-share-alt right m1"></i><?php echo $trans->getTrans($_REQUEST["action"],'SHARE_COLLECTION'); ?></a></li>
                                     </ul>
                                 <?php endif; ?>
                             </div>
@@ -76,12 +76,12 @@
                                     <div class="box3P record">
                                         <?php if ( is_array($register["docURL"]) ) : ?>
                                             <?php if ( 'portal' != $_SESSION['iahx'] && !empty($site) && array_key_exists($site, $register['docURL']) ) : ?>
-                                                <a href="<?php echo $register["docURL"][$site]; ?>" class="doctitle" onclick="__gaTracker('send','event','Favorite Documents','View Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');" target="_blank"><?php echo $register["title"]; ?></a>
+                                                <a href="<?php echo $register["docURL"][$site]; ?>" class="doctitle" onclick="gtag('send','event','Favorite Documents','View Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');" target="_blank"><?php echo $register["title"]; ?></a>
                                             <?php else : ?>
-                                                <a href="<?php echo $register["docURL"]["portal"]; ?>" class="doctitle" onclick="__gaTracker('send','event','Favorite Documents','View Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');" target="_blank"><?php echo $register["title"]; ?></a>
+                                                <a href="<?php echo $register["docURL"]["portal"]; ?>" class="doctitle" onclick="gtag('send','event','Favorite Documents','View Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');" target="_blank"><?php echo $register["title"]; ?></a>
                                             <?php endif; ?>
                                         <?php else : ?>
-                                            <a href="<?php echo $register["docURL"]; ?>" class="doctitle" onclick="__gaTracker('send','event','Favorite Documents','View Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');" target="_blank"><?php echo $register["title"]; ?></a>
+                                            <a href="<?php echo $register["docURL"]; ?>" class="doctitle" onclick="gtag('send','event','Favorite Documents','View Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');" target="_blank"><?php echo $register["title"]; ?></a>
                                         <?php endif; ?>
 
                                         <?php if ( $register["authors"] ) : ?>
@@ -91,9 +91,9 @@
                                     </div>
                                     <?php if ($register["dirID"] == null) { $dirID = 0; } ?>
                                     <div class="btn2Botoes">
-                                        <a href="#modal-remove-doc" class="btn3 btnDanger modal-trigger remove" data-source="<?php echo RELATIVE_PATH; ?>/controller/mydocuments/control/business/task/removedoc/document/<?php echo $register["docID"]; ?>/directory/<?php echo $register["dirID"]; ?>" data-title="<?php echo $register["title"]; ?>" onclick="__gaTracker('send','event','Favorite Documents','Remove Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');"><?php echo $trans->getTrans($_REQUEST["action"],'REMOVE_FROM_COLLECTION'); ?></a>
-                                        <a href="#modal-ajax" class="btn3 btnSuccess modal-trigger modal-ajax" data-source="<?php echo RELATIVE_PATH; ?>/controller/directories/control/business/task/movedoc/document/<?php echo $register["docID"]; ?>/directory/<?php echo $register["dirID"]; ?>/docsrc/<?php echo base64_encode($register["srcID"]); ?>" onclick="__gaTracker('send','event','Favorite Documents','Move Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');"><?php echo $trans->getTrans($_REQUEST["action"],'MOVE_TO'); ?></a>
-                                        <a href="#modal-related-docs" class="btn3 btnPrimary modal-trigger related-docs" onclick="__gaTracker('send','event','Favorite Documents','Related Documents','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
+                                        <a href="#modal-remove-doc" class="btn3 btnDanger modal-trigger remove" data-source="<?php echo RELATIVE_PATH; ?>/controller/mydocuments/control/business/task/removedoc/document/<?php echo $register["docID"]; ?>/directory/<?php echo $register["dirID"]; ?>" data-title="<?php echo $register["title"]; ?>" onclick="gtag('send','event','Favorite Documents','Remove Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');"><?php echo $trans->getTrans($_REQUEST["action"],'REMOVE_FROM_COLLECTION'); ?></a>
+                                        <a href="#modal-ajax" class="btn3 btnSuccess modal-trigger modal-ajax" data-source="<?php echo RELATIVE_PATH; ?>/controller/directories/control/business/task/movedoc/document/<?php echo $register["docID"]; ?>/directory/<?php echo $register["dirID"]; ?>/docsrc/<?php echo base64_encode($register["srcID"]); ?>" onclick="gtag('send','event','Favorite Documents','Move Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');"><?php echo $trans->getTrans($_REQUEST["action"],'MOVE_TO'); ?></a>
+                                        <a href="#modal-related-docs" class="btn3 btnPrimary modal-trigger related-docs" onclick="gtag('send','event','Favorite Documents','Related Documents','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
                                     </div>
                                 </div>
                             </article>
diff --git a/client/templates/default/mylinks.tpl.php b/client/templates/default/mylinks.tpl.php
index fde1776..bf2572a 100755
--- a/client/templates/default/mylinks.tpl.php
+++ b/client/templates/default/mylinks.tpl.php
@@ -37,8 +37,8 @@
                                         <small><?php echo $register["description"]; ?></small>
                                     </div>
                                     <div class="btn2Botoes">
-                                        <a href="#modal-remove-link" class="btn3 btnDanger modal-trigger remove" data-source="<?php echo RELATIVE_PATH; ?>/controller/mylinks/control/business/task/delete/link/<?php echo $register["linkID"]; ?>" data-title="<?php echo $register["name"]; ?>" onclick="__gaTracker('send','event','Favorite Links','Remove Link','<?php echo $register["url"]; ?>');"><?php echo $trans->getTrans($_REQUEST["action"],'REMOVE_LINK'); ?></a>
-                                        <a href="#modal-ajax" class="btn3 btnWarning modal-trigger modal-ajax" data-source="<?php echo RELATIVE_PATH; ?>/controller/mylinks/control/business/task/edit/link/<?php echo $register["linkID"]; ?>" onclick="__gaTracker('send','event','Favorite Links','Edit Link','<?php echo $register["url"]; ?>');"><i class="far fa-edit right m1"></i><?php echo $trans->getTrans($_REQUEST["action"],'EDIT_LINK'); ?></a>
+                                        <a href="#modal-remove-link" class="btn3 btnDanger modal-trigger remove" data-source="<?php echo RELATIVE_PATH; ?>/controller/mylinks/control/business/task/delete/link/<?php echo $register["linkID"]; ?>" data-title="<?php echo $register["name"]; ?>" onclick="gtag('send','event','Favorite Links','Remove Link','<?php echo $register["url"]; ?>');"><?php echo $trans->getTrans($_REQUEST["action"],'REMOVE_LINK'); ?></a>
+                                        <a href="#modal-ajax" class="btn3 btnWarning modal-trigger modal-ajax" data-source="<?php echo RELATIVE_PATH; ?>/controller/mylinks/control/business/task/edit/link/<?php echo $register["linkID"]; ?>" onclick="gtag('send','event','Favorite Links','Edit Link','<?php echo $register["url"]; ?>');"><i class="far fa-edit right m1"></i><?php echo $trans->getTrans($_REQUEST["action"],'EDIT_LINK'); ?></a>
                                     </div>
                                 </div>
                             </article>
diff --git a/client/templates/default/myprofiledocuments.tpl.php b/client/templates/default/myprofiledocuments.tpl.php
index 1609e0c..7677e34 100755
--- a/client/templates/default/myprofiledocuments.tpl.php
+++ b/client/templates/default/myprofiledocuments.tpl.php
@@ -22,8 +22,8 @@
     								<a class='dropdown-trigger btn2 btnSuccess' href='#' data-target='profile-actions'><i class="fas fa-angle-down"></i></a>
     								<!-- Dropdown Structure -->
     								<ul id='profile-actions' class='dropdown-content'>
-                                        <li><a class="modal-trigger modal-ajax" href="#modal-ajax" data-source="<?php echo RELATIVE_PATH; ?>/controller/myprofiledocuments/control/business/task/edit/profile/<?php echo $registerProfile["profileID"]; ?>" onclick="__gaTracker('send','event','Interest Topics','Edit Topic','<?php echo htmlspecialchars($registerProfile["profileName"]); ?>');"><i class="far fa-edit right m1"></i> <?php echo $trans->getTrans($_REQUEST["action"],'EDIT_PROFILE'); ?></a></li>
-                                        <li><a class="modal-trigger remove" href="#modal-remove-topic" data-source="<?php echo RELATIVE_PATH; ?>/controller/myprofiledocuments/control/business/task/delete/profile/<?php echo $registerProfile["profileID"]; ?>" onclick="__gaTracker('send','event','Interest Topics','Remove Topic','<?php echo htmlspecialchars($registerProfile["profileName"]); ?>');"><i class="fas fa-eraser right m1"></i> <?php echo $trans->getTrans($_REQUEST["action"],'REMOVE_PROFILE'); ?></a></li>
+                                        <li><a class="modal-trigger modal-ajax" href="#modal-ajax" data-source="<?php echo RELATIVE_PATH; ?>/controller/myprofiledocuments/control/business/task/edit/profile/<?php echo $registerProfile["profileID"]; ?>" onclick="gtag('send','event','Interest Topics','Edit Topic','<?php echo htmlspecialchars($registerProfile["profileName"]); ?>');"><i class="far fa-edit right m1"></i> <?php echo $trans->getTrans($_REQUEST["action"],'EDIT_PROFILE'); ?></a></li>
+                                        <li><a class="modal-trigger remove" href="#modal-remove-topic" data-source="<?php echo RELATIVE_PATH; ?>/controller/myprofiledocuments/control/business/task/delete/profile/<?php echo $registerProfile["profileID"]; ?>" onclick="gtag('send','event','Interest Topics','Remove Topic','<?php echo htmlspecialchars($registerProfile["profileName"]); ?>');"><i class="fas fa-eraser right m1"></i> <?php echo $trans->getTrans($_REQUEST["action"],'REMOVE_PROFILE'); ?></a></li>
     								</ul>
     							</div>
     						</div>
@@ -53,12 +53,12 @@
         						<article id="<?php echo 'doc'.$count; ?>" class="col s12 l6 xl4">
         							<div class="box2 hoverable">
                                         <div class="box2P record">
-                                            <a class="doctitle" href="<?php echo $similar["docURL"]; ?>" onclick="__gaTracker('send','event','Interest Topics','View Document','<?php echo addslashes(htmlspecialchars($similar["title"])); ?>');" target="_blank"><?php echo $similar["title"]; ?></a><br />
+                                            <a class="doctitle" href="<?php echo $similar["docURL"]; ?>" onclick="gtag('send','event','Interest Topics','View Document','<?php echo addslashes(htmlspecialchars($similar["title"])); ?>');" target="_blank"><?php echo $similar["title"]; ?></a><br />
             								<div class="boxAutor"><?php echo $similar["authors"]; ?></div>
                                         </div>
         								<div class="btn2Botoes">
-                                            <a href="#modal-ajax" class="btn3 btnSuccess modal-trigger modal-ajax add-collection" data-similar="<?php echo $similar["docID"]; ?>" data-source="<?php echo RELATIVE_PATH; ?>/controller/myprofiledocuments/control/business/task/addcol/similar/doc<?php echo $count; ?>" onclick="__gaTracker('send','event','Interest Topics','Favorite Documents','<?php echo htmlspecialchars($similar["title"]); ?>');"><?=$trans->getTrans($_REQUEST["action"],'ADD_COLLECTION')?></a>
-                                            <a href="#modal-related-docs" class="btn3 btnPrimary modal-trigger related-docs" onclick="__gaTracker('send','event','Interest Topics','Related Documents','<?php echo addslashes(htmlspecialchars($similar["title"])); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
+                                            <a href="#modal-ajax" class="btn3 btnSuccess modal-trigger modal-ajax add-collection" data-similar="<?php echo $similar["docID"]; ?>" data-source="<?php echo RELATIVE_PATH; ?>/controller/myprofiledocuments/control/business/task/addcol/similar/doc<?php echo $count; ?>" onclick="gtag('send','event','Interest Topics','Favorite Documents','<?php echo htmlspecialchars($similar["title"]); ?>');"><?=$trans->getTrans($_REQUEST["action"],'ADD_COLLECTION')?></a>
+                                            <a href="#modal-related-docs" class="btn3 btnPrimary modal-trigger related-docs" onclick="gtag('send','event','Interest Topics','Related Documents','<?php echo addslashes(htmlspecialchars($similar["title"])); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
         								</div>
         							</div>
         						</article>
diff --git a/client/templates/default/mypublicdocuments.tpl.php b/client/templates/default/mypublicdocuments.tpl.php
index ca64deb..0ffaa00 100644
--- a/client/templates/default/mypublicdocuments.tpl.php
+++ b/client/templates/default/mypublicdocuments.tpl.php
@@ -66,9 +66,9 @@
                                 <!-- Limitar duas linhas -->
                                 <div class="linkBreak record">
                                     <?php if ( is_array($register["docURL"]) ) : ?>
-                                        <a href="<?php echo $register["docURL"]["portal"]; ?>" class="doctitle" onclick="__gaTracker('send','event','Public Collection','View Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');" target="_blank"><?php echo $register["title"]; ?></a><br />
+                                        <a href="<?php echo $register["docURL"]["portal"]; ?>" class="doctitle" onclick="gtag('send','event','Public Collection','View Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');" target="_blank"><?php echo $register["title"]; ?></a><br />
                                     <?php else : ?>
-                                        <a href="<?php echo $register["docURL"]; ?>" class="doctitle" onclick="__gaTracker('send','event','Public Collection','View Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');" target="_blank"><?php echo $register["title"]; ?></a><br />
+                                        <a href="<?php echo $register["docURL"]; ?>" class="doctitle" onclick="gtag('send','event','Public Collection','View Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');" target="_blank"><?php echo $register["title"]; ?></a><br />
                                     <?php endif; ?>
 
                                     <?php if ( $register["authors"] ) : ?>
@@ -77,7 +77,7 @@
                                     <?php endif; ?>
                                 </div>
                                 <div class="btn2Botoes">
-                                    <a href="#modal-related-docs" class="btn3 btnPrimary modal-trigger related-docs public-related-docs" onclick="__gaTracker('send','event','Public Collection','Related Documents','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
+                                    <a href="#modal-related-docs" class="btn3 btnPrimary modal-trigger related-docs public-related-docs" onclick="gtag('send','event','Public Collection','Related Documents','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
                                 </div>
                             </div>
                         </article>
diff --git a/client/templates/default/mysearches.tpl.php b/client/templates/default/mysearches.tpl.php
index 9c9375e..9d0c914 100644
--- a/client/templates/default/mysearches.tpl.php
+++ b/client/templates/default/mysearches.tpl.php
@@ -46,12 +46,12 @@
                                         <td class="filter"><?php echo CharTools::shortenedQueryString($register['filter'], false); ?></td>
                                         <td class="center-align search-actions">
                                             <?php if ( 'portal' == $_SESSION['iahx'] ) : ?>
-                                            <a href="#!" id="v<?php echo $count; ?>" class="btn1 waves-effect blue darken-4 tooltipped search-query portal" data-origin="portal" data-query="<?php echo $register['query']; ?>" data-filter="<?php echo $register['filter']; ?>" data-position="top" data-tooltip="<?php echo $trans->getTrans($_REQUEST["action"],'VIEW'); ?>" onclick="__gaTracker('send','event','VHL Search History','Show Result','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="material-icons left">search</i></a>
+                                            <a href="#!" id="v<?php echo $count; ?>" class="btn1 waves-effect blue darken-4 tooltipped search-query portal" data-origin="portal" data-query="<?php echo $register['query']; ?>" data-filter="<?php echo $register['filter']; ?>" data-position="top" data-tooltip="<?php echo $trans->getTrans($_REQUEST["action"],'VIEW'); ?>" onclick="gtag('send','event','VHL Search History','Show Result','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="material-icons left">search</i></a>
                                             <?php else : ?>
-                                            <a href="#!" id="v<?php echo $count; ?>" class="btn1 waves-effect blue darken-4 tooltipped search-query search" data-origin="<?php echo $_SESSION['iahx']; ?>" data-label="<?php echo $label; ?>" data-query="<?php echo $register['query']; ?>" data-filter="<?php echo $register['filter']; ?>" data-position="top" data-tooltip="<?php echo $trans->getTrans($_REQUEST["action"],'VIEW'); ?>" onclick="__gaTracker('send','event','VHL Search History','Show Result','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="material-icons left">search</i></a>
+                                            <a href="#!" id="v<?php echo $count; ?>" class="btn1 waves-effect blue darken-4 tooltipped search-query search" data-origin="<?php echo $_SESSION['iahx']; ?>" data-label="<?php echo $label; ?>" data-query="<?php echo $register['query']; ?>" data-filter="<?php echo $register['filter']; ?>" data-position="top" data-tooltip="<?php echo $trans->getTrans($_REQUEST["action"],'VIEW'); ?>" onclick="gtag('send','event','VHL Search History','Show Result','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="material-icons left">search</i></a>
                                             <?php endif; ?>
-                                            <a href="#modal-combine" id="c<?php echo $count; ?>" class="btn1 waves-effect blue darken-2 tooltipped modal-trigger combine" data-query="<?php echo $register['query']; ?>" data-filter="<?php echo $register['filter']; ?>" data-position="top" data-tooltip="<?php echo $trans->getTrans($_REQUEST["action"],'COMBINE'); ?>" onclick="__gaTracker('send','event','VHL Search History','Combine Queries','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="material-icons left">shuffle</i></a>
-                                            <a href="#modal-remove-search" id="d<?php echo $count; ?>" class="btn1 waves-effect red darken-4 tooltipped modal-trigger remove" data-source="<?php echo $location.'/task/delete/?query='.$register['query'].'&filter='.$register['filter']; ?>" data-position="top" data-tooltip="<?php echo $trans->getTrans($_REQUEST["action"],'REMOVE'); ?>" onclick="__gaTracker('send','event','VHL Search History','Delete Query','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="material-icons left">delete</i></a>
+                                            <a href="#modal-combine" id="c<?php echo $count; ?>" class="btn1 waves-effect blue darken-2 tooltipped modal-trigger combine" data-query="<?php echo $register['query']; ?>" data-filter="<?php echo $register['filter']; ?>" data-position="top" data-tooltip="<?php echo $trans->getTrans($_REQUEST["action"],'COMBINE'); ?>" onclick="gtag('send','event','VHL Search History','Combine Queries','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="material-icons left">shuffle</i></a>
+                                            <a href="#modal-remove-search" id="d<?php echo $count; ?>" class="btn1 waves-effect red darken-4 tooltipped modal-trigger remove" data-source="<?php echo $location.'/task/delete/?query='.$register['query'].'&filter='.$register['filter']; ?>" data-position="top" data-tooltip="<?php echo $trans->getTrans($_REQUEST["action"],'REMOVE'); ?>" onclick="gtag('send','event','VHL Search History','Delete Query','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="material-icons left">delete</i></a>
                                         </td>
                                     </tr>
                                 <?php endforeach; ?>
@@ -134,7 +134,7 @@
                                     <td class="query"><?php echo CharTools::shortenedQueryString($register['query'], false); ?></td>
                                     <td class="filter"><?php echo CharTools::shortenedQueryString($register['filter'], false); ?></td>
                                     <td class="right-align search-actions">
-                                        <a href="#!" class="btn1 btnCombine waves-effect blue darken-2 tooltipped" data-query="<?php echo $register['query']; ?>" data-filter="<?php echo $register['filter']; ?>" data-position="top" data-tooltip="<?php echo $trans->getTrans($_REQUEST["action"],'COMBINE'); ?>" onclick="__gaTracker('send','event','VHL Search History','Combine Queries','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="material-icons left">shuffle</i></a>
+                                        <a href="#!" class="btn1 btnCombine waves-effect blue darken-2 tooltipped" data-query="<?php echo $register['query']; ?>" data-filter="<?php echo $register['filter']; ?>" data-position="top" data-tooltip="<?php echo $trans->getTrans($_REQUEST["action"],'COMBINE'); ?>" onclick="gtag('send','event','VHL Search History','Combine Queries','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="material-icons left">shuffle</i></a>
                                     </td>
                                 </tr>
                             <?php endforeach; ?>
diff --git a/client/templates/default/nav.tpl.php b/client/templates/default/nav.tpl.php
index 834dcd9..0b9021b 100644
--- a/client/templates/default/nav.tpl.php
+++ b/client/templates/default/nav.tpl.php
@@ -31,7 +31,7 @@
 			<input id="q" name="q" type="text" class="pm1 inputHeader" autocomplete="off">
 		</div>
 		<div class="col s3 m4 l5" id="boxBtSearch">
-			<button id="btSearch" class="btn btnSuccess" onclick="__gaTracker('send','event','My VHL','VHL Search Bar',document.getElementById('q').value);"><i class="fas fa-search"></i></button>
+			<button id="btSearch" class="btn btnSuccess" onclick="gtag('send','event','My VHL','VHL Search Bar',document.getElementById('q').value);"><i class="fas fa-search"></i></button>
 		</div>
 	</form>
 </header>
\ No newline at end of file
diff --git a/client/templates/default/orcidworks.tpl.php b/client/templates/default/orcidworks.tpl.php
index a27c22b..c79fd39 100644
--- a/client/templates/default/orcidworks.tpl.php
+++ b/client/templates/default/orcidworks.tpl.php
@@ -26,8 +26,8 @@
                                     <div class="btn2Botoes">
                                         <?php $google_scholar = GOOGLE_SCHOLAR_WS . urlencode($register["title"]); ?>
                                         <?php // $gs_links = SimilarDocs::getGoogleScholarLinks($_SESSION['userTK'], $put_code, $google_scholar); ?>
-                                        <a class="btn3 btnSuccess google-scholar" href="<?php echo $google_scholar; ?>" target="_blank" onclick="__gaTracker('send','event','ORCID','Google Scholar','<?php echo htmlspecialchars($register["title"]); ?>');"><?php echo $trans->getTrans($_REQUEST["action"],'GOOGLE_SCHOLAR'); ?></a>
-                                        <a href="#modal-related-docs" class="btn3 btnPrimary modal-trigger related-docs" onclick="__gaTracker('send','event','ORCID','Related Documents','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
+                                        <a class="btn3 btnSuccess google-scholar" href="<?php echo $google_scholar; ?>" target="_blank" onclick="gtag('send','event','ORCID','Google Scholar','<?php echo htmlspecialchars($register["title"]); ?>');"><?php echo $trans->getTrans($_REQUEST["action"],'GOOGLE_SCHOLAR'); ?></a>
+                                        <a href="#modal-related-docs" class="btn3 btnPrimary modal-trigger related-docs" onclick="gtag('send','event','ORCID','Related Documents','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
                                     </div>
                                 </div>
                             </article>
diff --git a/client/templates/default/searchresults.tpl.php b/client/templates/default/searchresults.tpl.php
index 330e5bb..082d474 100644
--- a/client/templates/default/searchresults.tpl.php
+++ b/client/templates/default/searchresults.tpl.php
@@ -23,8 +23,8 @@
                                         <a class='dropdown-trigger btn2 btnSuccess' href='#' data-target='dropdown1'><i class="fas fa-angle-down"></i></a>
                                         <!-- Dropdown Structure -->
                                         <ul id='dropdown1' class='dropdown-content btn2Buttons'>
-                                            <li><a href="#modal-ajax" class="modal-trigger modal-ajax" data-source="<?php echo RELATIVE_PATH; ?>/controller/searchresults/control/business/task/edit/rss/<?php echo $registerSearch["id"]; ?>" onclick="__gaTracker('send','event','Search Results','Edit RSS','<?php echo htmlspecialchars($registerSearch["name"]); ?>');"><i class="far fa-edit right m1"></i> <?php echo $trans->getTrans($_REQUEST["action"],'EDIT_RSS'); ?></a></li>
-                                            <li><a href="#modal-remove-rss" class="modal-trigger remove" data-source="<?php echo RELATIVE_PATH; ?>/controller/searchresults/control/business/task/delete/rss/<?php echo $registerSearch["id"]; ?>" data-title="<?php echo $registerSearch["name"]; ?>" onclick="__gaTracker('send','event','Search Results','Remove RSS','<?php echo htmlspecialchars($resultDirName); ?>');"><i class="fas fa-eraser right m1"></i><?php echo $trans->getTrans($_REQUEST["action"],'REMOVE_RSS'); ?></a></li>
+                                            <li><a href="#modal-ajax" class="modal-trigger modal-ajax" data-source="<?php echo RELATIVE_PATH; ?>/controller/searchresults/control/business/task/edit/rss/<?php echo $registerSearch["id"]; ?>" onclick="gtag('send','event','Search Results','Edit RSS','<?php echo htmlspecialchars($registerSearch["name"]); ?>');"><i class="far fa-edit right m1"></i> <?php echo $trans->getTrans($_REQUEST["action"],'EDIT_RSS'); ?></a></li>
+                                            <li><a href="#modal-remove-rss" class="modal-trigger remove" data-source="<?php echo RELATIVE_PATH; ?>/controller/searchresults/control/business/task/delete/rss/<?php echo $registerSearch["id"]; ?>" data-title="<?php echo $registerSearch["name"]; ?>" onclick="gtag('send','event','Search Results','Remove RSS','<?php echo htmlspecialchars($resultDirName); ?>');"><i class="fas fa-eraser right m1"></i><?php echo $trans->getTrans($_REQUEST["action"],'REMOVE_RSS'); ?></a></li>
                                         </ul>
                                     </div>
                                 </div>
@@ -78,9 +78,9 @@
                                             </div>
                                             <div class="btn2Buttons">
                                                 <?php if ( strpos( $registerSearch['url'], VHL_SEARCH_PORTAL_DOMAIN ) !== false ) : ?>
-                                                <a href="#modal-ajax" class="btn3 btnSuccess modal-trigger modal-ajax add-collection" data-similar="<?php echo $item["guid"]; ?>" data-source="<?php echo RELATIVE_PATH; ?>/controller/searchresults/control/business/task/addcol/similar/doc<?php echo $count; ?>" onclick="__gaTracker('send','event','Search Results','Favorite Documents','<?php echo htmlspecialchars($item["title"]); ?>');"><?=$trans->getTrans($_REQUEST["action"],'ADD_COLLECTION')?></a>
+                                                <a href="#modal-ajax" class="btn3 btnSuccess modal-trigger modal-ajax add-collection" data-similar="<?php echo $item["guid"]; ?>" data-source="<?php echo RELATIVE_PATH; ?>/controller/searchresults/control/business/task/addcol/similar/doc<?php echo $count; ?>" onclick="gtag('send','event','Search Results','Favorite Documents','<?php echo htmlspecialchars($item["title"]); ?>');"><?=$trans->getTrans($_REQUEST["action"],'ADD_COLLECTION')?></a>
                                                 <?php endif; ?>
-                                                <a href="#modal-related-docs" class="btn3 btnPrimary modal-trigger related-docs" onclick="__gaTracker('send','event','Search Results','Related Documents','<?php echo addslashes(htmlspecialchars($item["title"])); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
+                                                <a href="#modal-related-docs" class="btn3 btnPrimary modal-trigger related-docs" onclick="gtag('send','event','Search Results','Related Documents','<?php echo addslashes(htmlspecialchars($item["title"])); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
                                             </div>
                                         </div>
                                     </div>
diff --git a/client/templates/myvhl/authentication.tpl.php b/client/templates/myvhl/authentication.tpl.php
index dfa9f39..aca0156 100644
--- a/client/templates/myvhl/authentication.tpl.php
+++ b/client/templates/myvhl/authentication.tpl.php
@@ -32,7 +32,7 @@
                     <div class="col-xs-11 form-group pull-right top_search">
                         <div class="input-group">
                             <input type="text" id="q" name="q" class="form-control" placeholder="<?=$trans->getTrans('menu','SEARCH_FOR')?>">
-                            <span class="input-group-btn"><button class="btn btn-default" type="submit" onclick="__gaTracker('send','event','My VHL','VHL Search Bar',document.getElementById('q').value);"><?=$trans->getTrans('menu','SEARCH')?></button></span>
+                            <span class="input-group-btn"><button class="btn btn-default" type="submit" onclick="gtag('send','event','My VHL','VHL Search Bar',document.getElementById('q').value);"><?=$trans->getTrans('menu','SEARCH')?></button></span>
                             <input type="hidden" name="lang" value="<?=$_SESSION['lang']?>">
                         </div>
                     </div>
diff --git a/client/templates/myvhl/menu.tpl.php b/client/templates/myvhl/menu.tpl.php
index eb949e7..dab8081 100644
--- a/client/templates/myvhl/menu.tpl.php
+++ b/client/templates/myvhl/menu.tpl.php
@@ -23,18 +23,18 @@
             <div class="row tile_count">
               <div id="step7" class="col-md-3 col-sm-4 col-xs-6 tile_stats_count">
                 <span class="count_top"><i class="fa fa-file-o"></i> <?=$trans->getTrans('menu','MY_SHELF')?></span>
-                <div class="count"><a href="<?=RELATIVE_PATH?>/controller/mydocuments/control/business" onclick="__gaTracker('send','event','Overview','Favorite Documents','See All');"><?php echo $totalCollections; ?></a></div>
-                <span class="count_bottom"><a href="<?=RELATIVE_PATH?>/controller/mydocuments/control/business" onclick="__gaTracker('send','event','Overview','Favorite Documents','See All');"><?=$trans->getTrans('menu','SEE_ALL_DOCS')?></a></span>
+                <div class="count"><a href="<?=RELATIVE_PATH?>/controller/mydocuments/control/business" onclick="gtag('send','event','Overview','Favorite Documents','See All');"><?php echo $totalCollections; ?></a></div>
+                <span class="count_bottom"><a href="<?=RELATIVE_PATH?>/controller/mydocuments/control/business" onclick="gtag('send','event','Overview','Favorite Documents','See All');"><?=$trans->getTrans('menu','SEE_ALL_DOCS')?></a></span>
               </div>
               <div id="step8" class="col-md-3 col-sm-4 col-xs-6 tile_stats_count">
                 <span class="count_top"><i class="fa fa-external-link"></i> <?=$trans->getTrans('menu','MY_LINKS')?></span>
-                <div class="count green"><a href="<?=RELATIVE_PATH?>/controller/mylinks/control/business" onclick="__gaTracker('send','event','Overview','Favorite Links','See All');"><?php echo $totalLinks; ?></a></div>
-                <span class="count_bottom"><a href="<?=RELATIVE_PATH?>/controller/mylinks/control/business" onclick="__gaTracker('send','event','Overview','Favorite Links','See All');"><?=$trans->getTrans('menu','SEE_ALL_LINKS')?></a></span>
+                <div class="count green"><a href="<?=RELATIVE_PATH?>/controller/mylinks/control/business" onclick="gtag('send','event','Overview','Favorite Links','See All');"><?php echo $totalLinks; ?></a></div>
+                <span class="count_bottom"><a href="<?=RELATIVE_PATH?>/controller/mylinks/control/business" onclick="gtag('send','event','Overview','Favorite Links','See All');"><?=$trans->getTrans('menu','SEE_ALL_LINKS')?></a></span>
               </div>
               <div id="step9" class="col-md-3 col-sm-4 col-xs-6 tile_stats_count">
                 <span class="count_top"><i class="fa fa-folder-open-o"></i> <?=$trans->getTrans('menu','MY_PROFILE_DOCUMENTS')?></span>
-                <div class="count"><a href="<?=RELATIVE_PATH?>/controller/myprofiledocuments/control/business" onclick="__gaTracker('send','event','Overview','Interest Topics','See All');"><?php echo $totalProfiles; ?></a></div>
-                <span class="count_bottom"><a href="<?=RELATIVE_PATH?>/controller/myprofiledocuments/control/business" onclick="__gaTracker('send','event','Overview','Interest Topics','See All');"><?=$trans->getTrans('menu','SEE_ALL_PROFILES')?></a></span>
+                <div class="count"><a href="<?=RELATIVE_PATH?>/controller/myprofiledocuments/control/business" onclick="gtag('send','event','Overview','Interest Topics','See All');"><?php echo $totalProfiles; ?></a></div>
+                <span class="count_bottom"><a href="<?=RELATIVE_PATH?>/controller/myprofiledocuments/control/business" onclick="gtag('send','event','Overview','Interest Topics','See All');"><?=$trans->getTrans('menu','SEE_ALL_PROFILES')?></a></span>
               </div>
             </div>
             <!-- /top tiles -->
@@ -91,7 +91,7 @@
                         ?>
                         <article class="media event">
                           <div class="media-body">
-                            <a class="title" href="<?php echo $docURL; ?>" target="_blank" onclick="__gaTracker('send','event','Overview','Favorite Documents','<?php echo htmlspecialchars($col['title']); ?>');"><i class="fa fa-file-o" aria-hidden="true"></i><?php echo $col['title'] ?></a>
+                            <a class="title" href="<?php echo $docURL; ?>" target="_blank" onclick="gtag('send','event','Overview','Favorite Documents','<?php echo htmlspecialchars($col['title']); ?>');"><i class="fa fa-file-o" aria-hidden="true"></i><?php echo $col['title'] ?></a>
                           </div>
                         </article>
                       <?php endforeach; ?>
@@ -114,7 +114,7 @@
                       <?php foreach ( $profiles as $profile ) : ?>
                         <article class="media event">
                           <div class="media-body">
-                            <a class="title" href="<?php echo RELATIVE_PATH.'/controller/myprofiledocuments/control/business/profile/'.$profile["profileID"]; ?>" onclick="__gaTracker('send','event','Overview','Interest Topics','<?php echo htmlspecialchars($profile['profileName']); ?>');"><i class="fa fa-folder-open-o" aria-hidden="true"></i><?php echo $profile['profileName']; ?></a>
+                            <a class="title" href="<?php echo RELATIVE_PATH.'/controller/myprofiledocuments/control/business/profile/'.$profile["profileID"]; ?>" onclick="gtag('send','event','Overview','Interest Topics','<?php echo htmlspecialchars($profile['profileName']); ?>');"><i class="fa fa-folder-open-o" aria-hidden="true"></i><?php echo $profile['profileName']; ?></a>
                             <p><span><?=$trans->getTrans('menu','KEYWORDS')?>: </span><?php echo $profile['profileText']; ?></p>
                           </div>
                         </article>
@@ -138,7 +138,7 @@
                       <?php foreach ( $links as $link ) : ?>
                         <article class="media event">
                           <div class="media-body">
-                            <a class="title" href="<?php echo $link['url']; ?>" target="_blank" onclick="__gaTracker('send','event','Overview','Favorite Links','<?php echo $link['url']; ?>');"><i class="fa fa-external-link" aria-hidden="true"></i><?php echo $link['name']; ?></a>
+                            <a class="title" href="<?php echo $link['url']; ?>" target="_blank" onclick="gtag('send','event','Overview','Favorite Links','<?php echo $link['url']; ?>');"><i class="fa fa-external-link" aria-hidden="true"></i><?php echo $link['name']; ?></a>
                             <p><?php echo $link['description']; ?></p>
                           </div>
                         </article>
@@ -209,9 +209,9 @@
                               <td class="query"><?php echo CharTools::shortenedQueryString($search['query']); ?></td>
                               <td style="text-align: right;">
                                 <?php if ( 'portal' == $_SESSION['iahx'] ) : ?>
-                                <button id="v<?php echo $count; ?>" class="btn btn-primary btn-xs portal" value="portal" data-query="<?php echo $search['query']; ?>" data-filter="<?php echo $search['filter']; ?>" onclick="__gaTracker('send','event','Overview','VHL Search History','<?php echo htmlspecialchars($search['query']); ?>');"><i class="fa fa-search"></i> <?=$trans->getTrans('menu','VIEW')?></button>
+                                <button id="v<?php echo $count; ?>" class="btn btn-primary btn-xs portal" value="portal" data-query="<?php echo $search['query']; ?>" data-filter="<?php echo $search['filter']; ?>" onclick="gtag('send','event','Overview','VHL Search History','<?php echo htmlspecialchars($search['query']); ?>');"><i class="fa fa-search"></i> <?=$trans->getTrans('menu','VIEW')?></button>
                                 <?php else : ?>
-                                <button id="v<?php echo $count; ?>" class="btn btn-primary btn-xs search" value="<?php echo $_SESSION['iahx']; ?>" data-label="<?php echo $label; ?>" data-query="<?php echo $search['query']; ?>" data-filter="<?php echo $search['filter']; ?>" onclick="__gaTracker('send','event','Overview','VHL Search History','<?php echo htmlspecialchars($search['query']); ?>');"><i class="fa fa-search search"></i> <?=$trans->getTrans('menu','VIEW')?></button>
+                                <button id="v<?php echo $count; ?>" class="btn btn-primary btn-xs search" value="<?php echo $_SESSION['iahx']; ?>" data-label="<?php echo $label; ?>" data-query="<?php echo $search['query']; ?>" data-filter="<?php echo $search['filter']; ?>" onclick="gtag('send','event','Overview','VHL Search History','<?php echo htmlspecialchars($search['query']); ?>');"><i class="fa fa-search search"></i> <?=$trans->getTrans('menu','VIEW')?></button>
                                 <?php endif; ?>
                               </td>
                             </tr>
diff --git a/client/templates/myvhl/mydocuments.tpl.php b/client/templates/myvhl/mydocuments.tpl.php
index 3096759..4b973f1 100644
--- a/client/templates/myvhl/mydocuments.tpl.php
+++ b/client/templates/myvhl/mydocuments.tpl.php
@@ -50,9 +50,9 @@
                     <div class="folder-data col-md-9 col-sm-9 col-xs-12 col-list">
                         <h4><i class="fa fa-folder-o"></i> <?if ($resultDirName === null){ echo $trans->getTrans($_REQUEST["action"],'INCOMING_FOLDER'); }?><?=$resultDirName?></h4>
                         <?if ($_REQUEST["directory"] != 0){?>
-                            <a href="javascript:;" onclick="__gaTracker('send','event','Favorite Documents','Edit Collection','<?php echo htmlspecialchars($resultDirName); ?>'); window.open('<?=RELATIVE_PATH?>/controller/directories/control/business/task/edit/directory/<?=$_REQUEST["directory"]?>','','resizable=no,scrollbars=1,width=420,height=250');"><span class="label label-info"><?=$trans->getTrans($_REQUEST["action"],'EDIT_FOLDER')?></span></a>
-                            <a href="javascript:;" onclick="__gaTracker('send','event','Favorite Documents','Remove Collection','<?php echo htmlspecialchars($resultDirName); ?>'); window.open('<?=RELATIVE_PATH?>/controller/directories/control/business/task/delete/directory/<?=$_REQUEST["directory"]?>','','resizable=no,scrollbars=1,width=420,height=295')"><span class="label label-danger"><?=$trans->getTrans($_REQUEST["action"],'REMOVE_FOLDER')?></span></a>
-                            <a href="javascript:;" class="public-link" data-toggle="modal" data-target=".bs-public-modal-lg" onclick="__gaTracker('send','event','Favorite Documents','Share Collection','<?php echo htmlspecialchars($resultDirName); ?>');"><span class="label"><i class="fa fa-share-alt fa-lg"></i><?=$trans->getTrans($_REQUEST["action"],'SHARE_COLLECTION')?></span></a>
+                            <a href="javascript:;" onclick="gtag('send','event','Favorite Documents','Edit Collection','<?php echo htmlspecialchars($resultDirName); ?>'); window.open('<?=RELATIVE_PATH?>/controller/directories/control/business/task/edit/directory/<?=$_REQUEST["directory"]?>','','resizable=no,scrollbars=1,width=420,height=250');"><span class="label label-info"><?=$trans->getTrans($_REQUEST["action"],'EDIT_FOLDER')?></span></a>
+                            <a href="javascript:;" onclick="gtag('send','event','Favorite Documents','Remove Collection','<?php echo htmlspecialchars($resultDirName); ?>'); window.open('<?=RELATIVE_PATH?>/controller/directories/control/business/task/delete/directory/<?=$_REQUEST["directory"]?>','','resizable=no,scrollbars=1,width=420,height=295')"><span class="label label-danger"><?=$trans->getTrans($_REQUEST["action"],'REMOVE_FOLDER')?></span></a>
+                            <a href="javascript:;" class="public-link" data-toggle="modal" data-target=".bs-public-modal-lg" onclick="gtag('send','event','Favorite Documents','Share Collection','<?php echo htmlspecialchars($resultDirName); ?>');"><span class="label"><i class="fa fa-share-alt fa-lg"></i><?=$trans->getTrans($_REQUEST["action"],'SHARE_COLLECTION')?></span></a>
                         <?}?>
                         <select id="step17" class="bulkactions">
                             <option><?=$trans->getTrans($_REQUEST["action"],'BULK_ACTIONS')?></option>
@@ -95,10 +95,10 @@
                                             <?php if ( 'portal' != $_SESSION['iahx'] && !empty($site) && array_key_exists($site, $register['docURL']) ) : ?>
                                                 <?php echo $register["title"]; ?>
                                             <?php else : ?>
-                                                <a href="<?php echo $register["docURL"]["portal"]; ?>" onclick="__gaTracker('send','event','Favorite Documents','View Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');" target="_blank"><?php echo $register["title"]; ?></a>
+                                                <a href="<?php echo $register["docURL"]["portal"]; ?>" onclick="gtag('send','event','Favorite Documents','View Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');" target="_blank"><?php echo $register["title"]; ?></a>
                                             <?php endif; ?>
                                         <?php else : ?>
-                                            <a href="<?php echo $register["docURL"]; ?>" onclick="__gaTracker('send','event','Favorite Documents','View Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');" target="_blank"><?php echo $register["title"]; ?></a>
+                                            <a href="<?php echo $register["docURL"]; ?>" onclick="gtag('send','event','Favorite Documents','View Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');" target="_blank"><?php echo $register["title"]; ?></a>
                                         <?php endif; ?>
 
                                         <?php if ( $register["authors"] ) : ?>
@@ -114,9 +114,9 @@
                                     </div>
                                     <?if ($register["dirID"] == null){ $dirID = 0; }?>
                                     <div class="doc-actions">
-                                        <a class="label label-danger remove" href="<?=RELATIVE_PATH?>/controller/mydocuments/control/business/task/removedoc/document/<?=$register["docID"]?>/directory/<?=$register["dirID"]?>" onclick="__gaTracker('send','event','Favorite Documents','Remove Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');"><?php echo $trans->getTrans($_REQUEST["action"],'REMOVE_FROM_COLLECTION'); ?></a>
-                                        <a class="label label-info move" href="javascript:;" onclick="__gaTracker('send','event','Favorite Documents','Move Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>'); window.open('<?=RELATIVE_PATH?>/controller/directories/control/business/task/movedoc/document/<?=$register["docID"]?>/directory/<?=$register["dirID"]?>/docsrc/<?=base64_encode($register["srcID"])?>','','resizable=no,width=420,height=270');"><?php echo $trans->getTrans($_REQUEST["action"],'MOVE_TO'); ?></a>
-                                        <a class="label label-primary related-docs" href="javascript:;" onclick="__gaTracker('send','event','Favorite Documents','Related Documents','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
+                                        <a class="label label-danger remove" href="<?=RELATIVE_PATH?>/controller/mydocuments/control/business/task/removedoc/document/<?=$register["docID"]?>/directory/<?=$register["dirID"]?>" onclick="gtag('send','event','Favorite Documents','Remove Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');"><?php echo $trans->getTrans($_REQUEST["action"],'REMOVE_FROM_COLLECTION'); ?></a>
+                                        <a class="label label-info move" href="javascript:;" onclick="gtag('send','event','Favorite Documents','Move Document','<?php echo addslashes(htmlspecialchars($register["title"])); ?>'); window.open('<?=RELATIVE_PATH?>/controller/directories/control/business/task/movedoc/document/<?=$register["docID"]?>/directory/<?=$register["dirID"]?>/docsrc/<?=base64_encode($register["srcID"])?>','','resizable=no,width=420,height=270');"><?php echo $trans->getTrans($_REQUEST["action"],'MOVE_TO'); ?></a>
+                                        <a class="label label-primary related-docs" href="javascript:;" onclick="gtag('send','event','Favorite Documents','Related Documents','<?php echo addslashes(htmlspecialchars($register["title"])); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
                                     </div>
                                     <!--div>
                                       <span class="label label-default">Default</span>
diff --git a/client/templates/myvhl/mylinks.tpl.php b/client/templates/myvhl/mylinks.tpl.php
index 7852ca7..c89b0cb 100644
--- a/client/templates/myvhl/mylinks.tpl.php
+++ b/client/templates/myvhl/mylinks.tpl.php
@@ -53,8 +53,8 @@
                                         <small style="display: block;"><?php echo $register["description"]; ?></small>
                                     </div>
                                     <div>
-                                        <a class="remove" href="<?=RELATIVE_PATH?>/controller/mylinks/control/business/task/delete/link/<?=$register["linkID"]?>" onclick="__gaTracker('send','event','Favorite Links','Remove Link','<?php echo $register["url"]; ?>');"><span class="label label-danger"><?=$trans->getTrans($_REQUEST["action"],'REMOVE_LINK')?></span></a>
-                                        <a class="edit" href="javascript:;" onclick="__gaTracker('send','event','Favorite Links','Edit Link','<?php echo $register["url"]; ?>'); window.open('<?=RELATIVE_PATH?>/controller/mylinks/control/business/task/edit/link/<?=$register["linkID"]?>','','resizable=no,scrollbars=1,width=420,height=385')"><span class="label label-info"><?=$trans->getTrans($_REQUEST["action"],'EDIT_LINK')?></span></a>
+                                        <a class="remove" href="<?=RELATIVE_PATH?>/controller/mylinks/control/business/task/delete/link/<?=$register["linkID"]?>" onclick="gtag('send','event','Favorite Links','Remove Link','<?php echo $register["url"]; ?>');"><span class="label label-danger"><?=$trans->getTrans($_REQUEST["action"],'REMOVE_LINK')?></span></a>
+                                        <a class="edit" href="javascript:;" onclick="gtag('send','event','Favorite Links','Edit Link','<?php echo $register["url"]; ?>'); window.open('<?=RELATIVE_PATH?>/controller/mylinks/control/business/task/edit/link/<?=$register["linkID"]?>','','resizable=no,scrollbars=1,width=420,height=385')"><span class="label label-info"><?=$trans->getTrans($_REQUEST["action"],'EDIT_LINK')?></span></a>
                                     </div>
                                     <!--div>
                                       <span class="label label-default">Default</span>
diff --git a/client/templates/myvhl/myprofiledocuments.tpl.php b/client/templates/myvhl/myprofiledocuments.tpl.php
index 530592b..2a488e0 100644
--- a/client/templates/myvhl/myprofiledocuments.tpl.php
+++ b/client/templates/myvhl/myprofiledocuments.tpl.php
@@ -34,8 +34,8 @@
                       <div class="col-list">
                         <div class="folder-data">
                             <h4><i class="fa fa-folder-o"></i> <?=$registerProfile["profileName"]?></h4>
-                            <a class="edit" href="javascript:;" onclick="__gaTracker('send','event','Interest Topics','Edit Topic','<?php echo htmlspecialchars($registerProfile["profileName"]); ?>'); window.open('<?=RELATIVE_PATH?>/controller/myprofiledocuments/control/business/task/edit/profile/<?=$registerProfile["profileID"]?>','','resizable=no,scrollbars=1,width=420,height=385')"><span class="label label-info"><?=$trans->getTrans($_REQUEST["action"],'EDIT_PROFILE')?></span></a>
-                            <a class="remove" href="<?=RELATIVE_PATH?>/controller/myprofiledocuments/control/business/task/delete/profile/<?=$registerProfile["profileID"]?>" onclick="__gaTracker('send','event','Interest Topics','Remove Topic','<?php echo htmlspecialchars($registerProfile["profileName"]); ?>');"><span class="label label-danger"><?=$trans->getTrans($_REQUEST["action"],'REMOVE_PROFILE')?></span></a>
+                            <a class="edit" href="javascript:;" onclick="gtag('send','event','Interest Topics','Edit Topic','<?php echo htmlspecialchars($registerProfile["profileName"]); ?>'); window.open('<?=RELATIVE_PATH?>/controller/myprofiledocuments/control/business/task/edit/profile/<?=$registerProfile["profileID"]?>','','resizable=no,scrollbars=1,width=420,height=385')"><span class="label label-info"><?=$trans->getTrans($_REQUEST["action"],'EDIT_PROFILE')?></span></a>
+                            <a class="remove" href="<?=RELATIVE_PATH?>/controller/myprofiledocuments/control/business/task/delete/profile/<?=$registerProfile["profileID"]?>" onclick="gtag('send','event','Interest Topics','Remove Topic','<?php echo htmlspecialchars($registerProfile["profileName"]); ?>');"><span class="label label-danger"><?=$trans->getTrans($_REQUEST["action"],'REMOVE_PROFILE')?></span></a>
                         </div>
                         <div class="keywords"><small><?=$trans->getTrans($_REQUEST["action"],'PROFILE_KEYWORDS')?>: <?=$registerProfile["profileText"]?></small></div>
                         <div class="col-md-9 col-sm-9 col-xs-12">
@@ -55,12 +55,12 @@
                                     <tr id="<?php echo 'doc'.$count; ?>">
                                       <td>
                                         <div class="record">
-                                            <a href="<?php echo $similar["docURL"]; ?>" onclick="__gaTracker('send','event','Interest Topics','View Document','<?php echo addslashes(htmlspecialchars($similar["title"])); ?>');" target="_blank"><?php echo $similar["title"]; ?></a>
+                                            <a href="<?php echo $similar["docURL"]; ?>" onclick="gtag('send','event','Interest Topics','View Document','<?php echo addslashes(htmlspecialchars($similar["title"])); ?>');" target="_blank"><?php echo $similar["title"]; ?></a>
                                             <small style="display: block;"><?php echo $similar["authors"]; ?></small>
                                         </div>
                                         <div class="doc-actions">
-                                            <a class="label label-success add-collection" value="<?php echo $similar["docID"]; ?>" onclick="__gaTracker('send','event','Interest Topics','Favorite Documents','<?php echo htmlspecialchars($similar["title"]); ?>'); window.open('<?=RELATIVE_PATH?>/controller/myprofiledocuments/control/business/task/addcol/similar/doc<?=$count?>','','resizable=no,scrollbars=1,width=420,height=310')"><?=$trans->getTrans($_REQUEST["action"],'ADD_COLLECTION')?></a>
-                                            <a class="label label-primary related-docs" href="javascript:;" onclick="__gaTracker('send','event','Interest Topics','Related Documents','<?php echo htmlspecialchars($similar["title"]); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
+                                            <a class="label label-success add-collection" value="<?php echo $similar["docID"]; ?>" onclick="gtag('send','event','Interest Topics','Favorite Documents','<?php echo htmlspecialchars($similar["title"]); ?>'); window.open('<?=RELATIVE_PATH?>/controller/myprofiledocuments/control/business/task/addcol/similar/doc<?=$count?>','','resizable=no,scrollbars=1,width=420,height=310')"><?=$trans->getTrans($_REQUEST["action"],'ADD_COLLECTION')?></a>
+                                            <a class="label label-primary related-docs" href="javascript:;" onclick="gtag('send','event','Interest Topics','Related Documents','<?php echo htmlspecialchars($similar["title"]); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
                                         </div>
                                         <!--div>
                                           <span class="label label-default">Default</span>
diff --git a/client/templates/myvhl/mypublicdocuments.tpl.php b/client/templates/myvhl/mypublicdocuments.tpl.php
index 8cdcd67..40c676c 100644
--- a/client/templates/myvhl/mypublicdocuments.tpl.php
+++ b/client/templates/myvhl/mypublicdocuments.tpl.php
@@ -90,7 +90,7 @@
                                     </div>
                                     <?if ($register["dirID"] == null){ $dirID = 0; }?>
                                     <div class="doc-actions">
-                                        <a class="label label-primary public-related-docs" href="javascript:;" onclick="__gaTracker('send','event','Favorite Documents','Related Documents','<?php echo htmlspecialchars($register["title"]); ?>');"><?php echo $trans->getTrans('suggesteddocs','VHL_RELATED_DOCS'); ?></a>
+                                        <a class="label label-primary public-related-docs" href="javascript:;" onclick="gtag('send','event','Favorite Documents','Related Documents','<?php echo htmlspecialchars($register["title"]); ?>');"><?php echo $trans->getTrans('suggesteddocs','VHL_RELATED_DOCS'); ?></a>
                                     </div>
                                     <div class="related_docs">
                                         <div class="related-loading"><?php echo $trans->getTrans('suggesteddocs','LOADING'); ?></div>
diff --git a/client/templates/myvhl/mysearches.tpl.php b/client/templates/myvhl/mysearches.tpl.php
index 8711652..a4a1b38 100644
--- a/client/templates/myvhl/mysearches.tpl.php
+++ b/client/templates/myvhl/mysearches.tpl.php
@@ -61,12 +61,12 @@
                               <td class="filter step27"><?php echo CharTools::shortenedQueryString($register['filter']); ?></td>
                               <td class="step28">
                                 <?php if ( 'portal' == $_SESSION['iahx'] ) : ?>
-                                <button id="v<?php echo $count; ?>" class="btn btn-primary btn-xs portal" value="portal" data-query="<?php echo $register['query']; ?>" data-filter="<?php echo $register['filter']; ?>" onclick="__gaTracker('send','event','VHL Search History','Show Result','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="fa fa-search"></i> <?=$trans->getTrans($_REQUEST["action"],'VIEW')?></button>
+                                <button id="v<?php echo $count; ?>" class="btn btn-primary btn-xs portal" value="portal" data-query="<?php echo $register['query']; ?>" data-filter="<?php echo $register['filter']; ?>" onclick="gtag('send','event','VHL Search History','Show Result','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="fa fa-search"></i> <?=$trans->getTrans($_REQUEST["action"],'VIEW')?></button>
                                 <?php else : ?>
-                                <button id="v<?php echo $count; ?>" class="btn btn-primary btn-xs search" value="<?php echo $_SESSION['iahx']; ?>" data-label="<?php echo $label; ?>" data-query="<?php echo $register['query']; ?>" data-filter="<?php echo $register['filter']; ?>" onclick="__gaTracker('send','event','VHL Search History','Show Result','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="fa fa-search search"></i> <?=$trans->getTrans($_REQUEST["action"],'VIEW')?></button>
+                                <button id="v<?php echo $count; ?>" class="btn btn-primary btn-xs search" value="<?php echo $_SESSION['iahx']; ?>" data-label="<?php echo $label; ?>" data-query="<?php echo $register['query']; ?>" data-filter="<?php echo $register['filter']; ?>" onclick="gtag('send','event','VHL Search History','Show Result','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="fa fa-search search"></i> <?=$trans->getTrans($_REQUEST["action"],'VIEW')?></button>
                                 <?php endif; ?>
-                                <button id="c<?php echo $count; ?>" class="btn btn-info btn-xs combine" data-query="<?php echo $register['query']; ?>" data-filter="<?php echo $register['filter']; ?>" onclick="__gaTracker('send','event','VHL Search History','Combine Queries','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="fa fa-compress combine"></i> <?=$trans->getTrans($_REQUEST["action"],'COMBINE')?></button>
-                                <a href="<?php echo $location.'/task/delete/?query='.$register['query'].'&filter='.$register['filter']; ?>" id="d<?php echo $count; ?>" class="btn btn-danger btn-xs" onclick="__gaTracker('send','event','VHL Search History','Delete Query','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="fa fa-remove"></i> <?=$trans->getTrans($_REQUEST["action"],'REMOVE')?></a>
+                                <button id="c<?php echo $count; ?>" class="btn btn-info btn-xs combine" data-query="<?php echo $register['query']; ?>" data-filter="<?php echo $register['filter']; ?>" onclick="gtag('send','event','VHL Search History','Combine Queries','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="fa fa-compress combine"></i> <?=$trans->getTrans($_REQUEST["action"],'COMBINE')?></button>
+                                <a href="<?php echo $location.'/task/delete/?query='.$register['query'].'&filter='.$register['filter']; ?>" id="d<?php echo $count; ?>" class="btn btn-danger btn-xs" onclick="gtag('send','event','VHL Search History','Delete Query','<?php echo htmlspecialchars($register["query"]); ?>');"><i class="fa fa-remove"></i> <?=$trans->getTrans($_REQUEST["action"],'REMOVE')?></a>
                               </td>
                             </tr>
                             <?php endforeach; ?>
diff --git a/client/templates/myvhl/orcidworks.tpl.php b/client/templates/myvhl/orcidworks.tpl.php
index d5c5fd2..b5ced55 100644
--- a/client/templates/myvhl/orcidworks.tpl.php
+++ b/client/templates/myvhl/orcidworks.tpl.php
@@ -43,15 +43,15 @@
                                       $gs_links = SimilarDocs::getGoogleScholarLinks($_SESSION['userTK'], $put_code, $google_scholar);
                                   ?>
                                   <?php if ( !$gs_links[0]['cited_url'] && !$gs_links[0]['related_url'] ) : ?>
-                                  <a class="label label-success google-scholar" href="<?php echo $google_scholar; ?>" target="_blank" onclick="__gaTracker('send','event','ORCID','Google Scholar','<?php echo htmlspecialchars($register["title"]); ?>');"><?=$trans->getTrans($_REQUEST["action"],'GOOGLE_SCHOLAR')?></a>
+                                  <a class="label label-success google-scholar" href="<?php echo $google_scholar; ?>" target="_blank" onclick="gtag('send','event','ORCID','Google Scholar','<?php echo htmlspecialchars($register["title"]); ?>');"><?=$trans->getTrans($_REQUEST["action"],'GOOGLE_SCHOLAR')?></a>
                                   <?php endif; ?>
                                   <?php if ( $gs_links[0]['cited_url'] ) : ?>
-                                  <a class="label label-primary gs-cited" href="<?php echo GOOGLE_SCHOLAR . $gs_links[0]['cited_url']; ?>" target="_blank" onclick="__gaTracker('send','event','ORCID','Google Scholar - Cited','<?php echo htmlspecialchars($register["title"]); ?>');"><?php echo $trans->getTrans($_REQUEST["action"],'GOOGLE_SCHOLAR_CITED'); ?></a>
+                                  <a class="label label-primary gs-cited" href="<?php echo GOOGLE_SCHOLAR . $gs_links[0]['cited_url']; ?>" target="_blank" onclick="gtag('send','event','ORCID','Google Scholar - Cited','<?php echo htmlspecialchars($register["title"]); ?>');"><?php echo $trans->getTrans($_REQUEST["action"],'GOOGLE_SCHOLAR_CITED'); ?></a>
                                   <?php endif; ?>
                                   <?php if ( $gs_links[0]['related_url'] ) : ?>
-                                  <a class="label label-primary gs-related" href="<?php echo GOOGLE_SCHOLAR . $gs_links[0]['related_url']; ?>" target="_blank" onclick="__gaTracker('send','event','ORCID','Google Scholar - Related','<?php echo htmlspecialchars($register["title"]); ?>');"><?php echo $trans->getTrans($_REQUEST["action"],'GOOGLE_SCHOLAR_RELATED'); ?></a>
+                                  <a class="label label-primary gs-related" href="<?php echo GOOGLE_SCHOLAR . $gs_links[0]['related_url']; ?>" target="_blank" onclick="gtag('send','event','ORCID','Google Scholar - Related','<?php echo htmlspecialchars($register["title"]); ?>');"><?php echo $trans->getTrans($_REQUEST["action"],'GOOGLE_SCHOLAR_RELATED'); ?></a>
                                   <?php endif; ?>
-                                  <a class="label label-primary related-docs" href="javascript:;" onclick="__gaTracker('send','event','ORCID','Related Documents','<?php echo htmlspecialchars($register["title"]); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
+                                  <a class="label label-primary related-docs" href="javascript:;" onclick="gtag('send','event','ORCID','Related Documents','<?php echo htmlspecialchars($register["title"]); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
                                 </div>
                                 <div class="related_docs">
                                   <div class="related-loading"><?php echo $trans->getTrans('suggesteddocs','LOADING'); ?></div>
diff --git a/client/templates/myvhl/searchresults.tpl.php b/client/templates/myvhl/searchresults.tpl.php
index 0e3b173..304a614 100644
--- a/client/templates/myvhl/searchresults.tpl.php
+++ b/client/templates/myvhl/searchresults.tpl.php
@@ -57,8 +57,8 @@
                         <?php $registerSearch = $responseSearch["values"][0]; ?>
                         <div class="folder-data">
                             <h4><i class="fa fa-folder-o"></i> <?=$registerSearch["name"]?></h4>
-                            <a class="edit" href="javascript:;" onclick="__gaTracker('send','event','Search Results','Edit RSS','<?php echo htmlspecialchars($registerSearch["name"]); ?>'); window.open('<?=RELATIVE_PATH?>/controller/searchresults/control/business/task/edit/rss/<?=$registerSearch["id"]?>','','resizable=no,scrollbars=1,width=420,height=385')"><span class="label label-info"><?=$trans->getTrans($_REQUEST["action"],'EDIT_RSS')?></span></a>
-                            <a class="remove" href="<?=RELATIVE_PATH?>/controller/searchresults/control/business/task/delete/rss/<?=$registerSearch["id"]?>" onclick="__gaTracker('send','event','Search Results','Remove RSS','<?php echo htmlspecialchars($registerSearch["name"]); ?>');"><span class="label label-danger"><?=$trans->getTrans($_REQUEST["action"],'REMOVE_RSS')?></span></a>
+                            <a class="edit" href="javascript:;" onclick="gtag('send','event','Search Results','Edit RSS','<?php echo htmlspecialchars($registerSearch["name"]); ?>'); window.open('<?=RELATIVE_PATH?>/controller/searchresults/control/business/task/edit/rss/<?=$registerSearch["id"]?>','','resizable=no,scrollbars=1,width=420,height=385')"><span class="label label-info"><?=$trans->getTrans($_REQUEST["action"],'EDIT_RSS')?></span></a>
+                            <a class="remove" href="<?=RELATIVE_PATH?>/controller/searchresults/control/business/task/delete/rss/<?=$registerSearch["id"]?>" onclick="gtag('send','event','Search Results','Remove RSS','<?php echo htmlspecialchars($registerSearch["name"]); ?>');"><span class="label label-danger"><?=$trans->getTrans($_REQUEST["action"],'REMOVE_RSS')?></span></a>
                         </div>
                         <div id="step38" class="col-md-9 col-sm-9 col-xs-12">
                             <!-- start project list -->
@@ -78,9 +78,9 @@
                                     </div>
                                     <div class="doc-actions">
                                         <?php if ( strpos( $registerSearch['url'], VHL_SEARCH_PORTAL_DOMAIN ) !== false ) : ?>
-                                        <a class="label label-success add-collection" value="<?php echo $item["guid"]; ?>" onclick="__gaTracker('send','event','Search Results','Favorite Documents','<?php echo htmlspecialchars($item["title"]); ?>'); window.open('<?=RELATIVE_PATH?>/controller/searchresults/control/business/task/addcol/similar/doc<?=$count?>','','resizable=no,scrollbars=1,width=420,height=310')"><?=$trans->getTrans($_REQUEST["action"],'ADD_COLLECTION')?></a>
+                                        <a class="label label-success add-collection" value="<?php echo $item["guid"]; ?>" onclick="gtag('send','event','Search Results','Favorite Documents','<?php echo htmlspecialchars($item["title"]); ?>'); window.open('<?=RELATIVE_PATH?>/controller/searchresults/control/business/task/addcol/similar/doc<?=$count?>','','resizable=no,scrollbars=1,width=420,height=310')"><?=$trans->getTrans($_REQUEST["action"],'ADD_COLLECTION')?></a>
                                         <?php endif; ?>
-                                        <a class="label label-primary related-docs" href="javascript:;" onclick="__gaTracker('send','event','Search Results','Related Documents','<?php echo htmlspecialchars($item["title"]); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
+                                        <a class="label label-primary related-docs" href="javascript:;" onclick="gtag('send','event','Search Results','Related Documents','<?php echo htmlspecialchars($item["title"]); ?>');"><?php echo $trans->getTrans('suggesteddocs','RELATED_DOCS'); ?></a>
                                     </div>
                                     <div class="related_docs">
                                         <div class="related-loading"><?php echo $trans->getTrans('suggesteddocs','LOADING'); ?></div>
diff --git a/client/templates/myvhl/sidebar.tpl.php b/client/templates/myvhl/sidebar.tpl.php
index 58c9d49..61c3e40 100644
--- a/client/templates/myvhl/sidebar.tpl.php
+++ b/client/templates/myvhl/sidebar.tpl.php
@@ -87,7 +87,7 @@
                     <div class="input-group">
                         <input type="text" id="q" name="q" class="form-control" placeholder="<?=$trans->getTrans('menu','SEARCH_FOR')?>">
                         <span class="input-group-btn">
-                          <button class="btn btn-default" type="submit" onclick="__gaTracker('send','event','My VHL','VHL Search Bar',document.getElementById('q').value);"><?=$trans->getTrans('menu','SEARCH')?></button>
+                          <button class="btn btn-default" type="submit" onclick="gtag('send','event','My VHL','VHL Search Bar',document.getElementById('q').value);"><?=$trans->getTrans('menu','SEARCH')?></button>
                         </span>
                         <input type="hidden" name="lang" value="<?=$_SESSION['lang']?>">
                     </div>
diff --git a/server/templates/default/nav.tpl.php b/server/templates/default/nav.tpl.php
index 786c0de..d57e894 100644
--- a/server/templates/default/nav.tpl.php
+++ b/server/templates/default/nav.tpl.php
@@ -37,7 +37,7 @@
 			<input id="q" name="q" type="text" class="pm1 inputHeader" autocomplete="off">
 		</div>
 		<div class="col s3 m4 l5" id="boxBtSearch">
-			<button id="btSearch" class="btn btnSuccess" onclick="__gaTracker('send','event','My VHL','VHL Search Bar',document.getElementById('q').value);"><i class="fas fa-search"></i></button>
+			<button id="btSearch" class="btn btnSuccess" onclick="gtag('send','event','My VHL','VHL Search Bar',document.getElementById('q').value);"><i class="fas fa-search"></i></button>
 		</div>
 	</form>
 </header>
\ No newline at end of file