Improve escaping of projected fields

Fix #264

(cherry picked from commit c759218fee9c02e20b7ecc17bbec21f5aa8020a6)
Add back entire Hive suite

(cherry picked from commit 1bca7743e69b8846c6b666fa761d6119b7397423)