Nicer 404

At some point there was a small regression, and we started falling back to Blacklight. Test is tighter now. Fixes #852