improve 404 management