Adjust default tags to support internal values