Endless Village Raid

I decided to start a Raid by going to a Pillager Camp/Outpost that I found previosly and then killing a Captain to get a Bad Omen. Then I went to the village and it started. I was killing the waves when a Captain appeared. So I killed the Captain and it gave me a Bad Omen. I then finished the Raid (I knew this because it was the 7th wave). But then it started again and I was really confused then I fought of all of those and somewhere inbetween the killing I killed another Captain (i.e giving me a Bad Omen). Then it started again and this happened 7 times and a lot of dieing and frustration later I realised what was happening. Also 2 Raids happened at once as well. Mojang. Plz Fix