Refactor WebTagData and increase test coverage