fixed tomap tag