big fix on update_organization_tables