I tested on my code and it fails on both versions.

I have the test case running and passing, and I'm trying to change the structure to match my code as much as possible, but the biggest different is that I use jpa and an entityManager. So I need to change SearchTestBase.java to create an entityManager so I can update the code to use jpa. And then see what's going on.