Reuse existing MemoryQueries from model
Merge branch 'reuse-queries'