Result generator improvements