cleaned up redundant query code on setting team adapter