EHash lookup func. small updates