Fixed more changes on CORE-2106 for getting ContentGooruId and ParentGoo...

...ruId