HH-42147 improvements for self.json