[ticket/63] try to generate more correct links to start with