Bug 32531: Restore behaviour of 'include archived' filter