diff --git a/web/modules/modified/vote_up_down/js/VoteUpDown.js b/web/modules/modified/vote_up_down/js/VoteUpDown.js
index 752baed..a9661d7 100644
--- a/web/modules/modified/vote_up_down/js/VoteUpDown.js
+++ b/web/modules/modified/vote_up_down/js/VoteUpDown.js
@@ -13,7 +13,8 @@
         var operation;
 
         if($(this).is('.inactive'))
-          baseWidget.append('<img class="throbber" src="' + drupalSettings.path.baseUrl + '/' + settings.basePath + '/img/status-active.gif">');
+          baseWidget.append('<img class="throbber" src="' + location.protocol + '//' + location.host + '/' +
+              (drupalSettings.path.baseUrl == '/' ? '' : drupalSettings.path.baseUrl + '/') + settings.basePath + '/img/status-active.gif">');
 
         if($(this).is('a.up.inactive'))
           operation = 'up';
@@ -22,7 +23,13 @@
         else
           operation = 'reset';
 
-        voteUpDownService.vote(baseWidget, routeUrl, operation, settings.basePath, settings.points, settings.uservote);
+        var data = routeUrl.split('?');
+        var url_data = data[0].split('/');
+        var entity_type = url_data[2];
+        var entity_id = url_data[3];
+        var points = settings.points[entity_type][entity_id];
+        var uservote = settings.uservote ? (settings.uservote[entity_type][entity_id] ? settings.uservote[entity_type][entity_id] : 0) : 0;
+        voteUpDownService.vote(baseWidget, routeUrl, operation, settings.basePath, points, uservote);
       });
     }
   };
diff --git a/web/modules/modified/vote_up_down/js/VoteUpDownService.js b/web/modules/modified/vote_up_down/js/VoteUpDownService.js
index 3c61919..83e1954 100644
--- a/web/modules/modified/vote_up_down/js/VoteUpDownService.js
+++ b/web/modules/modified/vote_up_down/js/VoteUpDownService.js
@@ -24,12 +24,33 @@
               $(this).removeClass('inactive').addClass('active');
             });
             baseWidget.find('.reset').removeClass('element-invisible');
-            points -= uservote;
           }
-          else if(operation === 'up')
-            points -= uservote + 1;
-          else
-            points -= uservote - 1;
+          switch (operation) {
+            case 'up':
+              points -= uservote;
+              points += 1;
+              uservote = 1;
+              break;
+            case 'down':
+              points -= uservote;
+              points -= 1;
+              uservote = -1;
+              break;
+            case 'reset':
+              points -= uservote;
+              uservote = 0;
+              break;
+          }
+          baseWidget.find('.vote-current-score strong').text(points);
+
+          var data = url.split('?');
+          var url_data = data[0].split('/');
+          var entity_type = url_data[2];
+          var entity_id = url_data[3];
+
+          drupalSettings.points[entity_type][entity_id] = points;
+          if (!drupalSettings.uservote) {drupalSettings.uservote = {}; drupalSettings.uservote[entity_type] = []; }
+          drupalSettings.uservote[entity_type][entity_id] = uservote;
         }
       });
     };
diff --git a/web/modules/modified/vote_up_down/src/Plugin/VoteUpDownWidgetBase.php b/web/modules/modified/vote_up_down/src/Plugin/VoteUpDownWidgetBase.php
index b0adf56..953f168 100644
--- a/web/modules/modified/vote_up_down/src/Plugin/VoteUpDownWidgetBase.php
+++ b/web/modules/modified/vote_up_down/src/Plugin/VoteUpDownWidgetBase.php
@@ -106,7 +106,7 @@ public function build($entity) {
 
     $this->getWidgetTemplateVars($module_path, $widgetTemplateId, $variables);
 
-    $variables['#attached']['drupalSettings']['points'] = $points;
+    $variables['#attached']['drupalSettings']['points'][$entityTypeId][$entityId] = $points;
 
     if(vud_can_vote($currentUser)){
       $user_votes_current_entity = $vote_storage->getUserVotes(
@@ -142,7 +142,7 @@ public function build($entity) {
         $user_vote = $vote_storage->load($user_vote_id)->getValue();
 
         if($user_vote != 0) {
-          $variables['#attached']['drupalSettings']['uservote'] = $user_vote;
+          $variables['#attached']['drupalSettings']['uservote'][$entityTypeId][$entityId] = $user_vote;
 
           if($user_vote == 1){
             $variables['#link_class_up'] = 'up active';