UD: Attempted fix for unicode error
Web: Small cleanup