Fixed more changes on CORE-2106 for getting ContentItemId and ParentItemId