r9385: simple queries now work