Got add tag to properly select agter adding a tag. Other fixed & features.