fix #18

fix highlight bug and remove usless element(<g> tag)