[develop] Improve column quoting & remove query formatting