final tweaks for autoescaping