Fix - Does not include drafts for related objects indexing