Miscellaneous fixes for with_property_value scope on products