HTML encode fix

Prepared for Beta Test - Beta 1