danw
committed
on 25 Apr 01
query extraction and cleanup