LPS-47365 Fix comma and space problem