Add underscore dependency
Try to fix order for numerical tag names