Fix tagging for offline players
Improve tag routine parsing