query almost done, partial refinments