Clean up tags when they're deleted
Renamed questionnaire to survey section