Update domain extraction and finger match

Update domain extraction and finger match