Expand the query capabilities a little