Added valid switches to empty links