Updated tag attribute builder to support mixed content