fixed issue with mapping orgunit to org