Rescore query support, fixes #188