Fix jpa AND query
Merge pull request #1252 from erwinwinder/master

Fix jpa AND query