Fix to template tag quoting