Fix failing test
Add make_structured_list to query helpers