Fixed bug in page heading macro when property is empty string.

Tidied up script markup