Fix shown shipping methods in cart and improve shipping tax