Fix extracted source table ordering