Stop issuing N org queries per org#index