I don't think you need to clone the query you can just get the current rewrite method and set it back once you are done? If the rewrite method already allows term extraction we don't need to do anything and if so you can also set the query back into the context via updateRewriteQuery?