Organization list fixed in GCM module