Improvement of Where API resolution