O happy day

[cjsmith]

Continued progress - now the new query that used to work this afternoon (um, er, yesterday afternoon) is working again! That was a lot of small stuff to get right.