yon
committed
on 18 Feb 02
fixing some queries