We should probably need to move this logic to OG-vocab (in a follow up patch).