Bit more work on multi-delete support on server side