Merge pull request #1549 from tnull/2022-06-scorer-query-interface