Rewrite RFC7111 feature

## Feature Request

|    Q           |   A
|--------------- | ------
| New Feature    | no
| BC Break       | yes
| Version target | 10.0


### Proposal

The current implementation suffers from a lot of edge cases and silently fails on basic search.
We will introduce a complete rewrite of the feature currently in the master branch but not yet released.
