Better 404 detection