Simplify entityPQ