#1137 Added clause to check if product id or product model id isn't null to query for drafts
Fix to only query drafts that have either product id or product model id not null
Fix to only query drafts that have either product id or product model id not null