[BISERVER-11268] Fix Special Characters with Scheduling prpts plus some ...

...cleanup