Add multi-column query &w/ index optimization