Can't get the Waitlist button in product listing

-- HikaShop version -- : 2.3.4
-- Joomla version -- : 3.3.6

I have a product listing module attached to a category listing menu.

Everything works fine. It shows pagination buttons. it shows pictures, prices, ADD TO CART BUTTON, no stock text...

everything is a perfect world.

But there is no way to make a NOTIFY ME WHEN AVAILABLE button show.

It shows if I setup in Configuration - Features - Waitlist to show for all products. But if I put under per product basis no matter what I do with a certain product, it never shows.

My test product has Waitlist activated and quantity set to 0. No arrival date set.
I'm testing with a Customer logged in.

Any clue where to start checking?

UPDATE:
Add to cart button shows for those products available, and No stock message shows for no available.

Hi,

Please edit the view "product / quantity" and replace:

if(hikashop_level(1) && ($waitlist==2 || ($waitlist==1 && (!empty($this->element->main->product_waitlist) || !empty($this->element->product_waitlist))))){ ?>

if(hikashop_level(1) && ($waitlist==2 || ($waitlist==1 && (!empty($this->row->main->product_waitlist) || !empty($this->row->product_waitlist))))){ ?>

Great, it works perfectly, I understand this is a bug going to be fixed in next release, right?

And I have a question / request:

When I click on the "Notify me button" I get out of the product list to land in a specific Form to confirm the notify request. Can this screen be a popup?

It would be more clear in terms of user experience and then after confirming would get back to the product list, otherwise I get a "click here" button to get back to the product view (not the product list where I clicked the waitlist button) and is worse because I want my clients to ask notification right from product list and not from product view.

Was this bug fixed?

We are using 2.3.5 (can't upgrade right now to 2.4.0) and it still seems to exist.

Above user was using 2.3.4.

Please advise.

No never changed the file and definitely using 2.3.5.

It works when I change "activate waitlist feature" = "for all products" but when I change back to "on a per product basis" the "notify when available" button disappears (it is turned on on the product).

This is a new bug as it has worked in the past.