Fix tickets 881/887: Change links on the editor