Selection Builder zero rate fix, more js/html improvements