fix tag & destroyer page
refactor