Improve terminal searching