Fix to use HTML encoding for display strings on GUI