Couple of fixes to 'all' view