finished query re-org