Rename 'pquery' to 'query'