doc correction and refactoring for #275

Plugin-provided template fields are not available for queries. (Perhaps they
should be, though!)