Jhbate/fix team refresh

@nicolashery could you please take a look at this.

It relates to these items https://trello.com/c/V6j31PpP and https://trello.com/c/CeNUN8Ph which are todo with note refreshes. I have added some timing's into the code for reference but worried its a bit sluggish with the changes.

Thanks - Jamie