Currently the query param markers are placed in the order of ctid and xc_node_id. And the same order is ensured at a different place when BIND data row is generated. If possible, these two operations should use some common function/location where both the tasks are done so that it reduces the changes of the order of ctid and xc_node_id ending up differently at these two places.