Change default queries on new API