         #console.log('query=',opts.query)
         if opts.changes
             opts.client = @
+            delete opts.changes
+            if opts.options?
+                opts.cb?(err, "options not allowed for changefeed query")
+                return
             return new Query(opts)
         else
             cb = opts.cb

            changes : true
            cb : opts.cb

    syncquery: (query) =>
        keys = misc.keys(query)
        if keys.length != 1
            throw "must specify exactly one table"
        table = keys[0]
        x = {}
        if not misc.is_array(query[table])
            x[table] = [query[table]]
        else
            x[table] = query[table]
        return new SyncQuery(query:query, client:@)

    # TODO: deprecate this changefeed thing -- syncquery is good enough?  or REFACTOR
    # code between syncquery and changefeed
    changefeed: (opts) =>
        keys = misc.keys(opts)
        if keys.length != 1

        delete @_value
        @opts.client._query
            query   : @opts.query
            changes : true
            cb      : (err, resp) =>
                if @_closed
                    return
