Bugfix for commit: 8f5b4c9d7c79121b6552e33de63342b7f24f4c5b
The search for keys was erroneously changed. Now it behaves correctly (again) and does so with a better if sequence.