Fix UI parsing of comments