upgraded tag search