Compact queries with includes

BOOM :boom: