Custom data indentation fixes