NotFound tweaking