More QOL for imp/animal-attacks

Could you make it so that clicking on "Monsters are attacking" during an imp-raid cycles the focus through the remaining imps instead of just focussing one? Its currently pretty annoying to find/kill the last of them when your base is pretty big and has lots of hiding places/dead spots where they randomly spawn (i dont think you can make the spawning smarter or give them actually some AI that they move around and track nobles, and not just attack the first obstacle they encounter, right?).

Same might be true for rabid animals, they tend to attack and chase wild animals over the whole map, but i dont know what the message for that does upon clicking rn.

(otherwise show the red imp-nametag all the time and not just when they are actually seen by a noble?)