add tags and urls handling