added some matching for simple goaltype