refs #12 tweak query plans for clustering keys