Potential fix for encoding issue, pending testing. Also added comments to view override class