more refractoring, search EH by filename, some fixes