[BUGFIX] corrected key usage for where clause

Corrected a wrong usage for keys in where clause, which could lead to using already existing keys, and overrides some existing where clauses.

__Tasks:__

- [x] test coverage
- [ ] gather feedback for my changes
- [x] submit changes to the documentation
- [ ] ... <add your own tasks>


__Informations:__

| Q             | A
| ------------- | ---
| Tests pass?   | yes
| Fixed tickets | none
| Doc           | none