Query fixes.  Added more queries.