Fix link and add more tag