refactored tags