diff --git a/src/client.js b/src/client.js
index 8982086..90cbe93 100644
--- a/src/client.js
+++ b/src/client.js
@@ -110,7 +110,7 @@ function processTagFromUser(data) {
 function checkIfRequestSatisfy(request, data) {
     if (!request || request.mostRecent || request.receiverID !== data.receiverID)
         return false;
-    if (request.atKey && request.atKey !== data.vectorClock)
+    if (request.atVectorClock && request.atVectorClock !== data.vectorClock)
         return false;
     if (request.lowerVectorClock && request.lowerVectorClock > data.vectorClock)
         return false;
diff --git a/src/database.js b/src/database.js
index 1a6603c..99a3934 100644
--- a/src/database.js
+++ b/src/database.js
@@ -237,11 +237,11 @@ function Database(user, password, dbname, host = 'localhost') {
     db.searchData = function(snID, request) {
         return new Promise((resolve, reject) => {
             let conditionArr = [];
-            if (request.lowerVectorClock || request.upperVectorClock || request.atKey) {
-                if (request.lowerVectorClock && request.upperVectorClock)
+            if (request.lowerVectorClock || request.upperVectorClock || request.atVectorClock) {
+                if (request.atVectorClock)
+                    conditionArr.push(`${H_struct.VECTOR_CLOCK} = '${request.atVectorClock}'`);
+                else if (request.lowerVectorClock && request.upperVectorClock)
                     conditionArr.push(`${H_struct.VECTOR_CLOCK} BETWEEN '${request.lowerVectorClock}' AND '${request.upperVectorClock}'`);
-                else if (request.atKey)
-                    conditionArr.push(`${H_struct.VECTOR_CLOCK} = '${request.atKey}'`);
                 else if (request.lowerVectorClock)
                     conditionArr.push(`${H_struct.VECTOR_CLOCK} >= '${request.lowerVectorClock}'`);
                 else if (request.upperVectorClock)