1) Flatten conditions of filter 2) Use canonized collation for sortrel 3) Add CBO Correctness Unit test