* Fix - Use proper escaping for attributes.
* Tweak - WC 3.9 compatibility.
* Tweak - WC 3.8 compatibility.