rename pb_query to query