WIP
WIP fix empty links bug