Improves ConditionBuilder, fixes a bug in "order by"