Improve search cursor behavior