Adding space handling for discover ports