Improved API query.