diff --git a/beets/ui/commands.py b/beets/ui/commands.py
index 061fc3ab9..550bbce6d 100644
--- a/beets/ui/commands.py
+++ b/beets/ui/commands.py
@@ -84,6 +84,19 @@ def _showdiff(field, oldval, newval, color):
         print_(u'  %s: %s -> %s' % (field, oldval, newval))
 
 
+# fields: Shows a list of available fields for queries and format strings.
+fields_cmd = ui.Subcommand('fields',
+    help='show fields available for queries and format strings')
+def fields_func(lib, config, opts, args):
+    print "Available item fields:"
+    print "  " + "\n  ".join([key for key in library.ITEM_KEYS])
+    print "\nAvailable album fields:"
+    print "  " + "\n  ".join([key for key in library.ALBUM_KEYS])
+
+fields_cmd.func = fields_func
+default_commands.append(fields_cmd)
+
+
 # import: Autotagger and importer.
 
 DEFAULT_IMPORT_COPY           = True
@@ -719,6 +732,8 @@ import_cmd.parser.add_option('-L', '--library', dest='library',
     action='store_true', help='retag items matching a query')
 import_cmd.parser.add_option('-i', '--incremental', dest='incremental',
     action='store_true', help='skip already-imported directories')
+import_cmd.parser.add_option('-I', '--no-incremental', dest='incremental',
+    action='store_false', help='do not skip already-imported directories')
 def import_func(lib, config, opts, args):
     copy  = opts.copy  if opts.copy  is not None else \
         ui.config_val(config, 'beets', 'import_copy',
diff --git a/beetsplug/bpd/__init__.py b/beetsplug/bpd/__init__.py
index 8a5cdee45..9c40d7b03 100644
--- a/beetsplug/bpd/__init__.py
+++ b/beetsplug/bpd/__init__.py
@@ -793,10 +793,10 @@ class Server(BaseServer):
             # Trying to list a track.
             raise BPDError(ERROR_ARG, 'this is not a directory')
         else:
-            for name, itemid in node.files.iteritems():
+            for name, itemid in iter(sorted(node.files.items())):
                 item = self.lib.get_item(itemid)
                 yield self._item_info(item)
-            for name, _ in node.dirs.iteritems():
+            for name, _ in iter(sorted(node.dirs.iteritems())):
                 dirpath = self._path_join(path, name)
                 if dirpath.startswith(u"/"):
                     # Strip leading slash (libmpc rejects this).