rename *query* to *query-fn*