danw
committed
on 12 May 01
fixed up a few queries that I missed on the initial porting pass