Various changes:

* Remove "No charge" text from NAL service, refs #994
* Sort onhold services by priority
* Fix rules after subtype renaming