diff --git a/htroot/Bookmarks.html b/htroot/Bookmarks.html
index 20f153960..5661f0c2d 100644
--- a/htroot/Bookmarks.html
+++ b/htroot/Bookmarks.html
@@ -66,6 +66,14 @@
 					<dd>
 						<input type="text" name="description" id="description" value="#[description]#" size="80" />
 					</dd>
+                                        #(hasquery)#::
+					<dt>
+						<label for="query">Query:</label>
+					</dt>
+					<dd>
+						<input type="text" name="query" id="query" value="#[query]#" size="80" />
+					</dd>  
+                                        #(/hasquery)#
 					<dt>
 						<label for="folder">Folder (/folder/subfolder):</label>
 					</dt>
diff --git a/htroot/Bookmarks.java b/htroot/Bookmarks.java
index 097f59f97..f84cab345 100644
--- a/htroot/Bookmarks.java
+++ b/htroot/Bookmarks.java
@@ -176,6 +176,11 @@ public class Bookmarks {
                     }
 
                     bookmark.setTags(tags, true);
+                    
+                    if (post.containsKey("query")) {
+                        bookmark.setProperty(Bookmark.BOOKMARK_QUERY, post.get("query"));
+                        bookmark.setTimeStamp(System.currentTimeMillis());
+                    }
                     sb.bookmarksDB.saveBookmark(bookmark);
                 }
 
@@ -224,6 +229,13 @@ public class Bookmarks {
                         prop.putHTML("mode_tags", bookmark.getTagsString());
                         prop.putHTML("mode_path",bookmark.getFoldersString());
 
+                        if (bookmark.getQuery() != null) {
+                            prop.put("mode_hasquery","1");
+                            prop.putHTML("mode_hasquery_query", bookmark.getQuery());
+                        } else {
+                            prop.put("mode_hasquery", "0");
+                        }
+
                         if (bookmark.getPublic()) {
                             prop.put("mode_public", "1");
                         } else {