Using .dat only for internal calls
Fixing organization edition when no associated place