diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index d421a2f95..21971121d 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -469,7 +469,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
 
     @Override
     public void onTaskListItemClicked(long taskId, boolean editable) {
-        if (fragmentLayout != LAYOUT_SINGLE)
+        if (fragmentLayout != LAYOUT_SINGLE && editable)
             getIntent().putExtra(OPEN_TASK, taskId);
         CommentsFragment tuf = getTagUpdatesFragment();
         if (tuf != null)
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index b2e237322..0d2258e04 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -454,9 +454,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         if(Math.abs(DateUtilities.now() - task.getValue(Task.MODIFICATION_DATE)) < 2000L)
             mostRecentlyMade = task.getId();
 
-        //        // details and decorations, expanded
-
-
         if (Preferences.getBoolean(R.string.p_default_showdecorations_key, false)) {
             decorationManager.request(viewHolder);
         }
@@ -730,7 +727,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
             groupedQuery = PermaSql.replacePlaceholders(groupedQuery);
 
-            Query q = Query.select(Task.ID, Task.TITLE, Task.NOTES, Task.COMPLETION_DATE,
+            Query q = Query.select(Task.ID, Task.TITLE, Task.NOTES, Task.COMPLETION_DATE, Task.FLAGS, Task.USER_ID,
                     fileIdProperty)
                     .join(Join.left(Metadata.TABLE.as(METADATA_JOIN),
                             Criterion.and(Field.field(METADATA_JOIN + "." + Metadata.KEY.name).eq(FileMetadata.METADATA_KEY),
@@ -744,7 +741,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
                 for(fetchCursor.moveToFirst(); !fetchCursor.isAfterLast(); fetchCursor.moveToNext()) {
                     task.clear();
                     task.readFromCursor(fetchCursor);
-                    if(task.isCompleted())
+                    if(task.isCompleted() || !task.isEditable())
                         continue;
 
                     boolean hasAttachments = (fetchCursor.get(fileIdProperty) > 0);