We switched to PHPDataSets already but didn't migrate all usages. This commit now migrates all usages left behind.
The existing code didn't work with the provided data. We added a new test case to cover the situation. We adjusted the existing code to check on the actual rel value instead of the keys.