Fix subject_location in templates
Cleanup