Add raw-query mode