LPS-32869 Index the fields, select and radio, to the right way