Change to term/key rather than key/term and resolve issue with returnterms not working without regexp and problems when not using indexes pinned in-memory