decouple still in progress for patching plugin
_new sub queries module for patching
More cleanup
New usns