Add new selectivity options (3 & 4) from Cstar functions. Update relevant code for counting and tracking required selectivity parameters.