use new index query schema