Product should return variant value if available (fixes #674)