Allow a "query" to be passed in.

The query is ignored for now.