Alex/comment queries