Fixing conditional products output, product path is ugly now