more fixes to the script
Merge remote-tracking branch 'origin/hpfeeds-publishing' into hpfeeds-publishing