Added support for re-using aggregator object & setting match operation.
Removed queryEditLock.