Addressed jhartman's comments to queryplan.