diff --git a/demo/search.html b/demo/search.html
index 86b3afac..eccdc578 100644
--- a/demo/search.html
+++ b/demo/search.html
@@ -42,6 +42,10 @@
         <label for="query">Query:</label><input id="query" size=60>
     </div>
     <br>
+    <div>
+        <label for="has">Has:</label><input id="has">
+    </div>
+    <br>
     <div>
         <label for="offset">Offset:</label><input id="offset" type="number" value="0" size=5>
         <label for="limit">Limit:</label><input id="limit" type="number" value="25" size=5>
@@ -99,7 +103,7 @@
 </div>
 
 <script>
-    var search = new ssf.Search("7078106230763", "7078106230763");
+    var search = new ssf.Search("7078106230763", "k2rbHBd5CgU3/PKLFUKUYkmuhCiL2Gw2bnsD7MdaZrU=");
     var buttonEl = document.getElementById('search');
     var merge = document.getElementById('merge');
     var buttonIndex = document.getElementById('index');
@@ -117,6 +121,7 @@
     var realTimeIndexing = document.getElementById('realTimeIndexing');
     var batchNumber = document.getElementById('batchNumber');
     var timestamp = document.getElementById('getLatestMessageTimestamp');
+    var has = document.getElementById('has');
 
 
     buttonIndex.addEventListener('click', function () {
@@ -146,7 +151,8 @@
         if (threadIdEl.value && threadIdEl.value !== "" && threadIdEl.value.replace(/ /g, "").length > 0) {
             threadIdObj = JSON.parse(threadIdEl.value);
         }
-        search.searchQuery(queryEl.value, senderIdObj, threadIdObj, null, startDate, endDate, limitEl.value, offsetEl.value, 0).then(function (result) {
+        let _has = has.value || null;
+        search.searchQuery(queryEl.value, senderIdObj, threadIdObj, _has, startDate, endDate, limitEl.value, offsetEl.value, 0).then(function (result) {
             if (result.messages.length < 1) {
                 resultsEl.innerHTML = "No results found"
             }
@@ -194,7 +200,9 @@
 
     merge.addEventListener('click', function () {
         search.mergeIndexBatches().then(function () {
-            search.encryptIndex();
+            search.encryptIndex().then(function () {
+                resultsEl.innerHTML = "Merging and Encrypting index completed"
+            });
         }).catch(function (err) {
             resultsEl.innerHTML = 'Error: ' + err;
         });
diff --git a/js/search/search.js b/js/search/search.js
index 6f36b9c7..72b58afa 100644
--- a/js/search/search.js
+++ b/js/search/search.js
@@ -54,6 +54,7 @@ class Search {
      * @param key
      */
     constructor(userId, key) {
+        console.time('Decrypting');
         this.isInitialized = false;
         this.userId = userId;
         this.key = key;
@@ -68,6 +69,7 @@ class Search {
 
     decryptAndInit() {
         this.crypto.decryption().then(() => {
+            console.timeEnd('Decrypting');
             this.init();
         }).catch(() => {
             this.init();
@@ -206,10 +208,10 @@ class Search {
      * to the main user index
      */
     encryptIndex() {
-        this.crypto.encryption().then(() => {
+        return this.crypto.encryption().then(() => {
             return 'Success'
         }).catch((e) => {
-            throw new Error(e)
+            return (new Error(e));
         });
     }
 
@@ -219,7 +221,7 @@ class Search {
      * @param {String} query
      * @param {Array} senderIds
      * @param {Array} threadIds
-     * @param {String} attachments
+     * @param {String} fileType
      * @param {String} startDate
      * @param {String} endDate
      * @param {Number} limit
@@ -227,7 +229,7 @@ class Search {
      * @param {Number} sortOrder
      * @returns {Promise}
      */
-    searchQuery(query, senderIds, threadIds, attachments, startDate,
+    searchQuery(query, senderIds, threadIds, fileType, startDate,
                 endDate, limit, offset, sortOrder) {
 
         let _limit = limit;
@@ -245,7 +247,7 @@ class Search {
                 return;
             }
 
-            let q = Search.constructQuery(query, senderIds, threadIds);
+            let q = Search.constructQuery(query, senderIds, threadIds, fileType);
 
             if (q === undefined) {
                 reject(new Error('Search query error'));
@@ -326,16 +328,17 @@ class Search {
      * @param {String} searchQuery
      * @param {Array} senderId
      * @param {Array} threadId
+     * @param {String} fileType
      * @returns {string}
      */
-    static constructQuery(searchQuery, senderId, threadId) {
+    static constructQuery(searchQuery, senderId, threadId, fileType) {
 
-        let query = "";
+        let searchText = "";
         if(searchQuery !== undefined) {
-            query = searchQuery.trim().toLowerCase(); //to prevent injection of AND and ORs
+            searchText = searchQuery.trim().toLowerCase(); //to prevent injection of AND and ORs
         }
         let q = "";
-        let hashTags = Search.getHashTags(query);
+        let hashTags = Search.getHashTags(searchText);
         let hashCashTagQuery = "";
 
         if(hashTags.length > 0) {
@@ -346,27 +349,51 @@ class Search {
             hashCashTagQuery += ")";
         }
 
-        if (query.length > 0 ) {
-            q = "(text:(" + query + ")" + hashCashTagQuery + ")";
+        let hasAttachments = false;
+        let additionalAttachmentQuery = "";
+        if(fileType) {
+            hasAttachments = true;
+            if(fileType === "attachment") {
+                additionalAttachmentQuery = "(hasfiles:true)";
+            } else {
+                additionalAttachmentQuery = "(filetype:(" + fileType +"))";
+            }
+        }
+
+
+        if (searchText.length > 0 ) {
+            q = "((text:(" + searchText + "))" + hashCashTagQuery ;
+            if(hasAttachments) {
+                q += " OR (filename:(" + searchText + "))" ;
+            }
+            q = q + ")";
         }
 
         q = Search.appendFilterQuery(q, "senderId", senderId);
         q = Search.appendFilterQuery(q, "threadId", threadId);
 
         if(q === "") {
-            q = undefined; //will be handled in the search function
+            if(hasAttachments) {
+                q = additionalAttachmentQuery;
+            } else {
+                q = undefined; //will be handled in the search function
+            }
+        } else {
+            if(hasAttachments){
+                q = q + " AND " + additionalAttachmentQuery
+            }
         }
         return q;
     }
 
     /**
      * appending the senderId and threadId for the query
-     * @param {String} query
+     * @param {String} searchText
      * @param {String} fieldName
      * @param {Array} valueArray
      * @returns {string}
      */
-    static appendFilterQuery(query, fieldName, valueArray) {
+    static appendFilterQuery(searchText, fieldName, valueArray) {
         let q = "";
         if (valueArray && valueArray.length > 0 ) {
 
@@ -375,12 +402,12 @@ class Search {
                 q+= "\"" + item + "\" ";
             });
             q += "))";
-            if(query.length > 0 ) {
-                q = query + " AND " + q;
+            if(searchText.length > 0 ) {
+                q = searchText + " AND " + q;
             }
 
         } else {
-            q = query;
+            q = searchText;
         }
 
         return q;
@@ -392,12 +419,12 @@ class Search {
     /**
      * return the hash cash
      * tags from the query
-     * @param {String} query
+     * @param {String} searchText
      * @returns {Array}
      */
-    static getHashTags(query) {
+    static getHashTags(searchText) {
         let hashTags = [];
-        let tokens = query.toLowerCase()
+        let tokens = searchText.toLowerCase()
             .trim()
             .replace(/\s\s+/g, ' ')
             .split(' ').filter((el) => {return el.length !== 0});
diff --git a/library/indexvalidator-x64.exe b/library/indexvalidator-x64.exe
index f0f1bf31..11acebda 100755
Binary files a/library/indexvalidator-x64.exe and b/library/indexvalidator-x64.exe differ
diff --git a/library/indexvalidator-x86.exe b/library/indexvalidator-x86.exe
index 8b587d4d..181ff7db 100755
Binary files a/library/indexvalidator-x86.exe and b/library/indexvalidator-x86.exe differ
diff --git a/library/indexvalidator.exec b/library/indexvalidator.exec
index 4895e2aa..af67751b 100755
Binary files a/library/indexvalidator.exec and b/library/indexvalidator.exec differ
diff --git a/library/libsymphonysearch-x64.dll b/library/libsymphonysearch-x64.dll
index 065db992..1307bbd6 100755
Binary files a/library/libsymphonysearch-x64.dll and b/library/libsymphonysearch-x64.dll differ
diff --git a/library/libsymphonysearch-x86.dll b/library/libsymphonysearch-x86.dll
index 8ba31f0f..fd8c820f 100755
Binary files a/library/libsymphonysearch-x86.dll and b/library/libsymphonysearch-x86.dll differ
diff --git a/library/libsymphonysearch.dylib b/library/libsymphonysearch.dylib
index 99fb323b..a6b7d563 100755
Binary files a/library/libsymphonysearch.dylib and b/library/libsymphonysearch.dylib differ