Some progress with queries.