Added underscore to fix html entities issue