tidying of poll, query, and getrule