Found more places where 404 should be emitted