Modified comparison on generator id and referenced generator from content