Agreed with first task.
For the second task, I have some remarks.
My problem is not with removing the findXXX operations, there are not so many anyway.
The issue is with the testing which is inherently complexer when using the queries - since there are multiple permutatioms of usage that
could lead to unforseen bugs. Testing the findXXX operations is easier. Otoh, the queries should be tested in depth anyway…
OK for removing the Page class. I introduced it, but never liked it and it existed ever since 😉