Final fix of selectivity + weights