Merge "Adds queries->provider tag"