DEVELOPER-814 - Fix sys_content_id to avoid duplicate results