Improved searching for "shift" and "more, letters" buttons