Dynamic filter for Stock status considers "Do not track inventory" items as "in stock".

I have an automated inventory system which imports special order products as “Do not track inventory” and a special order tag. I use dynamic filters (2.0) on my shop, including a checkbox for stock status. Looks like Shopify’s behavior is to consider any products with “Do not track inventory” as “in stock”.

Is there any way to set it so that “in stock” is only for items that have actual Quantity of inventory over 0?

If not, is there a way to add an additional filter (while keeping Dynamic filtering), which will show the current result set EXCLUDING those items either marked “do not track inventory” or tagged special order?