Freeze config object
Rewrote query structure