Improved EH searching