Making both text and ID linkable again in all requests