Add adecuated organization id. Fix id initialization when non historical mode