Add multi-column query &w/ index optimization
Add multi-column query &w/ index optimization