Shortening "query combo" to "combo" in most places