Tag Selected: improve flexibility