Added handling of commas and publish settings