fix colocation and order types