add tag list
small refactoring