fix bugs in new anonynmous view
Merge commit 'github/testing' into beta