add cross select support