diff --git a/src/controllers/challenges.js b/src/controllers/challenges.js
index 233a9a543b..1f566923b4 100644
--- a/src/controllers/challenges.js
+++ b/src/controllers/challenges.js
@@ -67,12 +67,18 @@ api.get = function(req, res) {
 
 api.getMember = function(req, res) {
   var cid = req.params.cid, uid = req.params.uid;
-  var elMatch = {$elemMatch:{'challenge.id':cid}};
+  // TMK we can't use $elemMatch (which would make things much cleaner) @see http://goo.gl/MxmWdQ & http://goo.gl/Iku44w
+  // Revert back to 9fbb45c to see the $elemMatch solution
   User.findById(uid)
-    .select({'profile.name':1, habits:elMatch, dailys:elMatch, rewards:elMatch, todos:elMatch})
+    .select('profile.name habits dailys rewards todos')
     .exec(function(err, member){
       if(err) return res.json(500, {err:err});
       if (!member) return res.json(404, {err: 'Member '+uid+' for challenge '+cid+' not found'});
+      _.each(['habits','dailys','todos', 'rewards'], function(type){
+        member[type] = _.filter(member[type], function(task){
+          return task.challenge && task.challenge.id && task.challenge.id == cid;
+        });
+      });
       res.json(member);
     })
 }
diff --git a/views/options/social/challenges.jade b/views/options/social/challenges.jade
index 5811ec2cc9..dabced873f 100644
--- a/views/options/social/challenges.jade
+++ b/views/options/social/challenges.jade
@@ -9,12 +9,12 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.cl
 script(type='text/ng-template', id='partials/options.social.challenges.detail.member.html')
   .modal.wide-modal
     .modal-header
-        button.close(type='button', ng-click='$state.go("^")', aria-hidden='true') ×
-        h3 {{obj.profile.name}}
-      .modal-body
-        habitrpg-tasks(main=false)
-      .modal-footer
-        a.btn(ng-click='$state.go("^")') Close
+      button.close(type='button', ng-click='$state.go("^")', aria-hidden='true') ×
+      h3 {{obj.profile.name}}
+    .modal-body
+      habitrpg-tasks(main=false)
+    .modal-footer
+      a.btn(ng-click='$state.go("^")') Close
 
 script(type='text/ng-template', id='partials/options.social.challenges.detail.html')
   // Edit button
diff --git a/views/shared/header/header.jade b/views/shared/header/header.jade
index 28a32bee52..626d295786 100644
--- a/views/shared/header/header.jade
+++ b/views/shared/header/header.jade
@@ -1,4 +1,4 @@
-// @TODO ui:connectionAlert
+//.header-wrap(ng-controller='HeaderCtrl', data-spy="affix", data-offset-top="148")
 .header-wrap(ng-controller='HeaderCtrl')
   a.label.undo-button(x-bind='click:undo', ng-show='_undo') Undo
   div(ng-if='!user.preferences.hideHeader')