LPS-47362 Fix comma and space problem