improved default queries