diff --git a/app/views/tasks/_impediment.html.erb b/app/views/tasks/_impediment.html.erb
old mode 100644
new mode 100755
diff --git a/app/views/tasks/_task.html.erb b/app/views/tasks/_task.html.erb
index 486c55e2c..e78f0e436 100755
--- a/app/views/tasks/_task.html.erb
+++ b/app/views/tasks/_task.html.erb
@@ -11,7 +11,7 @@
   <div class="meta">
     <div class="story_id"><%= task.parent_id %></div>
     <div class="status_id"><%= task.status_id %></div>
-    <div class="previous"><%= task.higher_item.nil? ? '' : task.higher_item.id %></div>
+    <div class="previous"><%= task.right_sibling.nil? ? '' : task.right_sibling.id %></div>
     <div class="errors">
       <%- task.errors.each_error do |a, err| %>
       <div><%= "#{l(a)} #{l(err.type)}" %></div>
@@ -19,4 +19,4 @@
     </div>
   </div>
   <%- end %>
-</div>
\ No newline at end of file
+</div>
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
old mode 100644
new mode 100755
diff --git a/features/team_member.feature b/features/team_member.feature
old mode 100644
new mode 100755
diff --git a/features/team_member_steps.rb b/features/team_member_steps.rb
old mode 100644
new mode 100755
diff --git a/lib/backlogs_query_patch.rb b/lib/backlogs_query_patch.rb
index a54a909fa..f59abc434 100755
--- a/lib/backlogs_query_patch.rb
+++ b/lib/backlogs_query_patch.rb
@@ -21,6 +21,10 @@ def self.included(base) # :nodoc:
                                         # sprint name, in case start dates are the same
                                         "(select name from versions where versions.id = issues.fixed_version_id)",
 
+                                        # make sure stories with NULL
+                                        # position sort-last
+                                        "(select case when root.position is null then 1 else 0 end from issues root where issues.root_id = root.id)",
+
                                         # story position
                                         "(select root.position from issues root where issues.root_id = root.id)",