How to deal with VAT on a sales refund from a bank feed?

When processing a sales refund (expense) from a bank feed, you select Sales as the category and then 20% S for VAT.

However, QBO then puts the VAT in Box 4 and the net amount in Box 7, despite it being a sales refund and going to a Sales category. Being a sales refund it should go in Box 1 and Box 6 as a negative of course. 

I have tried setting up a new tax code, but regardless, as it is an expense going out the bank, QBO then puts it in the expense boxes on a VAT Return.

Whilst there is no overall impact to the amount due or from HMRC, the returns are incorrect if this is happening.

QB support just says there's nothing that can be done, other than processing each refund separately. 

However, with a paypal or stripe account download - that's just not a feasable solution with a significant volume of transactions.

I remember when you could select from the drop down "20% S Sales" or "20% S Purchases" on a transaction, but now, that option is no longer there and QBO is just deciding if its income it should go to Box 1 and 6, if it's an expense, it's Box 3 and 7. No choice!