Added conditional into hibachientitydetailgroup