Improve escaping of projected fields

Fix #264