diff --git a/buku b/buku
index 2a4b0a7..816fb9d 100755
--- a/buku
+++ b/buku
@@ -943,25 +943,25 @@ def format_json(resultset, single=False):
         marks = []
         for row in resultset:
             if showOpt == 1:
-                record = { 'url': row[1] }
+                record = { 'uri': row[1] }
             elif showOpt == 2:
-                record = { 'url': row[1], 'tags': row[3][1:-1] }
+                record = { 'uri': row[1], 'tags': row[3][1:-1] }
             else:
-                record = { 'url': row[1], 'title': row[2], 'comment': row[4], 'tags': row[3][1:-1]}
+                record = { 'uri': row[1], 'title': row[2], 'description': row[4], 'tags': row[3][1:-1]}
 
             marks.append(record)
     else:
         marks = {}
         for row in resultset:
             if showOpt == 1:
-                marks['url'] = row[1]
+                marks['uri'] = row[1]
             elif showOpt == 2:
-                marks['title'] = row[2]
+                marks['uri'] = row[1]
                 marks['tags']  = row[3][1:-1]
             else:
-                marks['url']   = row[1]
+                marks['uri']   = row[1]
                 marks['title'] = row[2]
-                marks['comment'] = row[4]
+                marks['description'] = row[4]
                 marks['tags']  = row[3][1:-1]
 
     return json.dumps(marks, sort_keys=True, indent=4)