Fixed issue with " ," rendered instead of ", "
Fixed comma space issue
Merge branch 'comma-space-issue' into new-theme