Names converted to links & small metadata fix