Improve precedence rules for JPQL