I think the solution Paul posted works perfectly, although you'd have to do it for one query at a time:
- Create a new page
- Drag a list onto the page and associate the list to the query that needs tidying
- Go to the data items...