apikeys fix and org view fix