Fixes for auto-escape in expressions