Updated shipping rate calculation query