Add APIName with spaces and html_safe