Fix empty dns and dom vars