Fix for new Cursor implementation breaking targeting search