Several improvements to 'expired' view