More label simplifications, move 404 redirections to conditions.