How can I enable an availability filter for in-stock items in my store?

[offseticons]

Hi all,

I have a large number of products in my store, and they are generally made to order. However, I do keep some inventory in stock sometimes. Due to this, in my Shopify Admin, I have all my products set to "Track Inventory" as well as "continue selling when out of stock." 

When my customers are in the catalog/collections page, I want them to be able to filter and show what is in stock and ready to ship, if they don't want to wait for a build-to-order piece. However, when I enable the Availability filter, it just shows that all my products are available, despite having a handful of products with true in-stock inventory and the rest with no in-stock inventory.

How an I accomplish what I'm trying to do here?

Thanks in advance!

[Caprani]

Having a similar issue, did you ever find a solution for this? 

[LottieandLysh]

Did you find a solution?