Fix issue with singular form of string not being output correctly.
Re-run linter, fix bugs with incorrect singular form output var.