Adding better innerHTML support

Change-Id: Ib4c95d3f80f4d159111791c8e564391b07284e81