Improve the `Search::removeEntry()` method (see #6785)