Updated filtering on products