Bricks Builder: Duplicate “All Terms (Categories)"

When selecting Archive type in the Bricks Builder template conditions, it shows two “All Terms (Categories)” options. One is for posts and one is for products. Ideally, the naming should be different for product archives, such as “All Terms (Product Categories)” or “All Terms (Product Type)”.

Also, the dynamic tags for product title and product pricing are not working. Maybe I’m doing something wrong, but they are currently not working for me.