add good query for original DDI