fix #1811 helpshift reintegration and small fixes

fix #1811 helpshift reintegration and small fixes