diff --git a/src/client.js b/src/client.js
index 735ca41..85190f1 100644
--- a/src/client.js
+++ b/src/client.js
@@ -152,6 +152,8 @@ function checkIfRequestSatisfy(request, data) {
         return false;
     if (request.upperVectorClock && request.upperVectorClock < data.vectorClock)
         return false;
+    if (request.afterTime && request.afterTime > data.log_time)
+        return false;
     if (request.application !== data.application)
         return false;
     if (request.comment && request.comment !== data.comment)
diff --git a/src/server.js b/src/server.js
index 70c0b16..feddba3 100644
--- a/src/server.js
+++ b/src/server.js
@@ -38,7 +38,7 @@ module.exports = function Server(port, client, intra) {
                     res.end(JSON.stringify(result[0]));
                     if (result[1]) {
                         refresher.countdown;
-                        if (result[1] === 'DATA')
+                        if (['DATA', 'TAG', 'NOTE'].includes(result[1]))
                             sendToLiveRequests(result[0]);
                         intra.forwardToNextNode(result[1], result[0]);
                     };