Tweaks to the cardinality model

Simpler solution for OR selectivity
Assume independence between predicates