Right now olam-haba-world-to-come is about both "the Afterlife" and "the days of Mashiach". Is this a good status quo or not?
We have enough questions about the messiah (the person, and fake ones, and the Josephite(?) one) that he can have his own tag.
And then another tag for the messianic era would be appropriate, perhaps also including questions about the future resurrection (but not questions about resurrection in general).
And a tag about resurrection (both the future general-populace one and resurrection in general).
And a tag for the personal afterlife (heaven and/or hell, if you will) awaiting us all when we die.
Names could be, perhaps: messiah (already exists); atid-lavo or eschatology; resurrection-of-the-dead (already exists); and heaven-hell (to replace existing heaven). All with good tag wikis. The existing tag olam-haba-world-to-come would be deprecated as ambiguous and its tag wiki would say to use heaven-hell or atid-lavo/eschatology as appropriate.