adjusted query metrics for api refactor 0.7