enhance domains lists handling