fix tag search method
refactor