Fixed query errors in payment and shipping modules