Shopify Search & Discovery

When adding products under 'Edit product recommendations' section I would like filter options. At present search results include archived and draft products without any indication of status. It's only once they're added that a you're warned eg. "Archived products won't appear as a recommendation". This makes it very slow to find relivant products.