Move comment queries to scopes