package-query support