Added (again) handling of "term" as an alternative to "query".