[NUCCORE-1177] Refactor location of query inmemory.
[NUCCORE-1175] Fix refactor of "wrapper" to be "wrappers" as per
original JIRA