diff --git a/etiquette/objects.py b/etiquette/objects.py
index d7a3b65..26caeee 100644
--- a/etiquette/objects.py
+++ b/etiquette/objects.py
@@ -757,7 +757,7 @@ class Photo(ObjectBase):
             self.photodb.log.debug('Committing - rename file')
             self.photodb.commit()
         else:
-            queue_action = {'action': args, 'args': args}
+            queue_action = {'action': action, 'args': args}
             self.photodb.on_commit_queue.append(queue_action)
 
         self.__reinit__()
diff --git a/etiquette_site.py b/etiquette_site.py
index eea3c62..5fd75d3 100644
--- a/etiquette_site.py
+++ b/etiquette_site.py
@@ -585,6 +585,7 @@ def get_tags_core(specific_tag=None):
     else:
         tags = specific_tag.walk_children()
     tags = list(tags)
+    tags.sort(key=lambda x: x.qualified_name())
     return tags
 
 @site.route('/tags')