Add some moar queries related to the PR