Add ordering on last two columns