Swap order of that.delimitTarget() and that.delimitQuery() to match