Fixed handling atom metric and tag names