Improve well searching when escaping