Bug Fix: My Favorites List Might Not Display

See
https://trello.com/c/cZ0if7Ax/203-investigate-possibly-missing-favorites
Merge branch 'NeilCresswell-hotfixes'
Merge branch 'master' into improvements