Fix the selected option falsely revert to <All threats>
Some small fixes