better query (clintongormley++)