Made changes to the query, it now calculates shippingcost propperly.
Merge remote-tracking branch 'origin/master'