JoinOptimizer update 2