fix #1811 helpshift reintegration and small fixes

fix #1811 helpshift reintegration and small fixes
Should this be typed? ie: `HashMap<String, HashMap<String, Object>> config = new HashMap<String, HashMap<String, Object>> ();`