add more nhs.net quoting types
fix bad class name