Fix #638. Rename renderQuery option "query" to avoid legacy conflict