Added proper tag and title name