Tag Selected: improve safety