Fixed mappings from self-submission to dataset
Fixed templates to ensure they escape user input