initial query support for v5