Merge "Adds queries tag to manifest"