updated server to include tag and links