Some fixes in SelectedOptions trace analyzer