separate flag for whether Keyword.getQuery() vs. Keyword.toString()