Fix empty domain selection