Empty link bug fixed, like feature implemented