Event ws id updating on export if not present and other simplifications