Adjusted admin queries after schema change