PLFM-2397 follow-up

John asked that I remove from QueryUtils the assumption that the query is against entities.  This pull request implements the requested change.