Fix data structure for source join reformatting