Misc changes

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.3
| Fixed tickets | 


-1 for this change, as we are sure `->findOneBy()` will be the last method call in this chain.