During remove_product_query, remove ordering filters to prevent affecting other queries