diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TaskCommentsFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TaskCommentsFragment.java
index 8a779a07e..57aac3166 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TaskCommentsFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TaskCommentsFragment.java
@@ -8,6 +8,7 @@ import android.widget.ListView;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.sql.Criterion;
+import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.adapter.UpdateAdapter;
@@ -55,10 +56,10 @@ public class TaskCommentsFragment extends CommentsFragment {
     @Override
     protected Cursor getCursor() {
         if (!task.containsNonNullValue(Task.REMOTE_ID))
-            return updateDao.query(Query.select(Update.PROPERTIES).where(Update.TASK_LOCAL.eq(task.getId())));
+            return updateDao.query(Query.select(Update.PROPERTIES).where(Update.TASK_LOCAL.eq(task.getId())).orderBy(Order.desc(Update.CREATION_DATE)));
         else
             return updateDao.query(Query.select(Update.PROPERTIES).where(Criterion.or(
-                    Update.TASK.eq(task.getValue(Task.REMOTE_ID)), Update.TASK_LOCAL.eq(task.getId()))));
+                    Update.TASK.eq(task.getValue(Task.REMOTE_ID)), Update.TASK_LOCAL.eq(task.getId()))).orderBy(Order.desc(Update.CREATION_DATE)));
     }
 
     @Override
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
index 1c6f17bff..bb521e97d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -47,6 +47,7 @@ import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.sql.Criterion;
+import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
@@ -286,11 +287,11 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
 
         TodorooCursor<Update> updates;
         if (!task.containsNonNullValue(Task.REMOTE_ID)) {
-            updates = updateDao.query(Query.select(Update.PROPERTIES).where(Update.TASK_LOCAL.eq(task.getId())));
+            updates = updateDao.query(Query.select(Update.PROPERTIES).where(Update.TASK_LOCAL.eq(task.getId())).orderBy(Order.desc(Update.CREATION_DATE)));
         }
         else  {
             updates = updateDao.query(Query.select(Update.PROPERTIES).where(Criterion.or(
-                    Update.TASK.eq(task.getValue(Task.REMOTE_ID)), Update.TASK_LOCAL.eq(task.getId()))));
+                    Update.TASK.eq(task.getValue(Task.REMOTE_ID)), Update.TASK_LOCAL.eq(task.getId()))).orderBy(Order.desc(Update.CREATION_DATE)));
         }
         try {
             Update update = new Update();
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index c8adda406..f8b6a201b 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -315,6 +315,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
             }
         }
 
+        showEditComments = Preferences.getBoolean(R.string.p_show_task_edit_comments, true);
+
         TypedValue tv = new TypedValue();
         getActivity().getTheme().resolveAttribute(R.attr.asCommentButtonImg, tv, false);
         commentIcon = tv.data;
@@ -350,9 +352,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         setUpUIComponents();
         adjustInfoPopovers();
 
-        showEditComments = Preferences.getBoolean(R.string.p_show_task_edit_comments, true);
-
-
         Preferences.setBoolean(R.string.p_showed_tap_task_help, true);
 
         overrideFinishAnim = false;
diff --git a/astrid/src/com/todoroo/astrid/service/TagDataService.java b/astrid/src/com/todoroo/astrid/service/TagDataService.java
index f97777b26..16341c984 100644
--- a/astrid/src/com/todoroo/astrid/service/TagDataService.java
+++ b/astrid/src/com/todoroo/astrid/service/TagDataService.java
@@ -146,7 +146,7 @@ public class TagDataService {
                     criterion).
                     orderBy(Order.desc(Update.CREATION_DATE)));
         if(tagData.getValue(TagData.REMOTE_ID) == 0)
-            return updateDao.query(Query.select(Update.PROPERTIES).where(Update.TAGS_LOCAL.like("%," + tagData.getId() + ",%")));
+            return updateDao.query(Query.select(Update.PROPERTIES).where(Update.TAGS_LOCAL.like("%," + tagData.getId() + ",%")).orderBy(Order.desc(Update.CREATION_DATE)));
         return updateDao.query(Query.select(Update.PROPERTIES).where(Criterion.and(criterion,
                 Criterion.or(Update.TAGS.like("%," + tagData.getValue(TagData.REMOTE_ID) + ",%"),
                 Update.TAGS_LOCAL.like("%," + tagData.getId() + ",%")))).