baselayout: Ensure links are preserved