Fix individually selected tags issue