Tag Selected: improve