Issue on aborting search fix