multi domain fixes

check for the right domain and skip name entry